diff --git a/datasets/demo-shop/data/seed-data/organizations.yaml b/datasets/demo-shop/data/seed-data/organizations.yaml
index e6d651f..4f27ad2 100644
--- a/datasets/demo-shop/data/seed-data/organizations.yaml
+++ b/datasets/demo-shop/data/seed-data/organizations.yaml
@@ -1,19 +1,8 @@
 ---
   id: restorecommerce-demo-root-organization
   name: Restorecommerce Demo Root
-  contactPointIds: []
-  website: ""
-  email: ""
-  vatId: ""
-  isicV4: ""
-  registration: ""
-  logo: 
-    url: ""
-  registrationCourt: ""
-  paymentMethodIds: []
-  parentId: "system"
+  parentId: system
   meta:
-    modifiedBy: ""
     owners:
       - id: urn:restorecommerce:acs:names:ownerIndicatoryEntity
         value: urn:restorecommerce:acs:model:organization.Organization
@@ -23,19 +12,8 @@
 ---
   id: restorecommerce-demo-shops-organization
   name: Restorecommerce Demo Shops
-  contactPointIds: []
-  website: ""
-  email: ""
-  vatId: ""
-  isicV4: ""
-  registration: ""
-  logo: 
-    url: ""
-  registrationCourt: ""
-  paymentMethodIds: []
   parentId: restorecommerce-demo-root-organization
   meta:
-    modifiedBy: ""
     owners:
       - id: urn:restorecommerce:acs:names:ownerIndicatoryEntity
         value: urn:restorecommerce:acs:model:organization.Organization
@@ -45,19 +23,8 @@
 ---
   id: restorecommerce-demo-customers-organization
   name: Restorecommerce Demo Customers
-  contactPointIds: []
-  website: ""
-  email: ""
-  vatId: ""
-  isicV4: ""
-  registration: ""
-  logo: 
-    url: ""
-  registrationCourt: ""
-  paymentMethodIds: []
   parentId: restorecommerce-demo-root-organization
   meta:
-    modifiedBy: ""
     owners:
       - id: urn:restorecommerce:acs:names:ownerIndicatoryEntity
         value: urn:restorecommerce:acs:model:organization.Organization
diff --git a/datasets/demo-shop/jobs/job_catalog.json b/datasets/demo-shop/jobs/job_catalog.json
index 0a72d03..10d4639 100644
--- a/datasets/demo-shop/jobs/job_catalog.json
+++ b/datasets/demo-shop/jobs/job_catalog.json
@@ -1,6 +1,6 @@
 {
+  "base": "./datasets/demo-shop/data/generated/catalog/",
   "options": {
-    "base": "./datasets/demo-shop/data/generated/catalog/",
     "concurrency": 1
   },
   "tasks": [
diff --git a/datasets/demo-shop/jobs/job_fulfillment.json b/datasets/demo-shop/jobs/job_fulfillment.json
index 93d750f..8617223 100644
--- a/datasets/demo-shop/jobs/job_fulfillment.json
+++ b/datasets/demo-shop/jobs/job_fulfillment.json
@@ -1,6 +1,6 @@
 {
+  "base": "./datasets/demo-shop/data/seed-data/",
   "options": {
-    "base": "./datasets/demo-shop/data/seed-data/",
     "concurrency": 1
   },
   "tasks": [
diff --git a/datasets/demo-shop/jobs/job_identity.json b/datasets/demo-shop/jobs/job_identity.json
index e571232..9cda75a 100644
--- a/datasets/demo-shop/jobs/job_identity.json
+++ b/datasets/demo-shop/jobs/job_identity.json
@@ -1,6 +1,6 @@
 {
+  "base": "./datasets/demo-shop/data/seed-data/",
   "options": {
-    "base": "./datasets/demo-shop/data/seed-data/",
     "concurrency": 1
   },
   "tasks": [
diff --git a/datasets/demo-shop/jobs/job_master.json b/datasets/demo-shop/jobs/job_master.json
index eadc121..4e0ca99 100644
--- a/datasets/demo-shop/jobs/job_master.json
+++ b/datasets/demo-shop/jobs/job_master.json
@@ -1,6 +1,6 @@
 {
+  "base": "./datasets/demo-shop/data/seed-data/",
   "options": {
-    "base": "./datasets/demo-shop/data/seed-data/",
     "concurrency": 1
   },
   "tasks": [
@@ -22,17 +22,17 @@
       "filter": "organizations.yaml",
       "mutation": "mutation mutateOrganizations($var: [IIoRestorecommerceOrganizationOrganization!]!){ master_data { organization { Mutate( input: { items: $var, totalCount: 0, mode: UPSERT } ) { details{items {status {id, code, message}}, operationStatus { code message } } } } } }"
     },
-    {
-      "name": "customers",
-      "operation": "sync",
-      "filter": "customers.yaml",
-      "mutation": "mutation{ master_data { customer { Mutate( input: { items: ${resource_list}, totalCount: 0, mode: UPSERT } ) { details{items {status {id, code, message}}, operationStatus { code message } } } } }}"
-    },
     {
       "name": "shops",
       "operation": "sync",
       "filter": "shops.yaml",
       "mutation": "mutation{ master_data { shop { Mutate( input: { items: ${resource_list}, totalCount: 0, mode: UPSERT } ) { details{items {status {id, code, message}}, operationStatus { code message } } } } }}"
+    },
+    {
+      "name": "customers",
+      "operation": "sync",
+      "filter": "customers.yaml",
+      "mutation": "mutation{ master_data { customer { Mutate( input: { items: ${resource_list}, totalCount: 0, mode: UPSERT } ) { details{items {status {id, code, message}}, operationStatus { code message } } } } }}"
     }
   ]
 }
diff --git a/datasets/demo-shop/jobs/job_samples.json b/datasets/demo-shop/jobs/job_samples.json
index 0f2fe41..689677f 100644
--- a/datasets/demo-shop/jobs/job_samples.json
+++ b/datasets/demo-shop/jobs/job_samples.json
@@ -1,6 +1,6 @@
 {
+  "base": "./datasets/demo-shop/data/sample-data/",
   "options": {
-    "base": "./datasets/demo-shop/data/sample-data/",
     "concurrency": 1
   },
   "tasks": [
diff --git a/datasets/system/data/seed-data/organizations.yaml b/datasets/system/data/seed-data/organizations.yaml
index 1f80b7a..00ac2a9 100644
--- a/datasets/system/data/seed-data/organizations.yaml
+++ b/datasets/system/data/seed-data/organizations.yaml
@@ -1,7 +1,9 @@
 ---
   id: system
   name: SYSTEM
+  parentId: ""
   meta:
+    modifiedBy: ""
     owners:
       - id: urn:restorecommerce:acs:names:ownerIndicatoryEntity
         value: urn:restorecommerce:acs:model:organization.Organization
diff --git a/datasets/system/jobs/job_extra.json b/datasets/system/jobs/job_extra.json
index 215d639..8c2ab7a 100644
--- a/datasets/system/jobs/job_extra.json
+++ b/datasets/system/jobs/job_extra.json
@@ -1,6 +1,6 @@
 {
+  "base": "./datasets/system/data/generated/",
   "options": {
-    "base": "./datasets/system/data/generated/",
     "concurrency": 1
   },
   "tasks": [
diff --git a/datasets/system/jobs/job_identity.json b/datasets/system/jobs/job_identity.json
index 55c81f2..4457cdd 100644
--- a/datasets/system/jobs/job_identity.json
+++ b/datasets/system/jobs/job_identity.json
@@ -1,6 +1,6 @@
 {
+  "base": "./datasets/system/data/seed-data/",
   "options": {
-    "base": "./datasets/system/data/seed-data/",
     "concurrency": 1
   },
   "tasks": [
diff --git a/datasets/system/jobs/job_master.json b/datasets/system/jobs/job_master.json
index bd87be3..6d9de98 100644
--- a/datasets/system/jobs/job_master.json
+++ b/datasets/system/jobs/job_master.json
@@ -1,21 +1,9 @@
 {
+  "base": "./datasets/system/data/seed-data/",
   "options": {
-    "base": "./datasets/system/data/seed-data/",
     "concurrency": 1
   },
   "tasks": [
-    {
-      "name": "organizations",
-      "operation": "sync",
-      "filter": "organizations.yaml",
-      "mutation": "mutation mutateOrganizations($var: [IIoRestorecommerceOrganizationOrganization!]!){ master_data { organization { Mutate( input: { items: $var, totalCount: 0, mode: UPSERT } ) { details{items {status {id, code, message}}, operationStatus { code message } } } } }}"
-    },
-    {
-      "name": "countries",
-      "operation": "sync",
-      "filter": "countries.yaml",
-      "mutation": "mutation{ master_data { country { Mutate( input: { items: ${resource_list}, totalCount: 0, mode: UPSERT } ) { details{items {status {id, code, message}},  operationStatus { code message }} } } }}"
-    },
     {
       "name": "timezones",
       "operation": "sync",
@@ -28,6 +16,18 @@
       "filter": "locales.yaml",
       "mutation": "mutation{ master_data { locale { Mutate( input: { items: ${resource_list}, totalCount: 0, mode: UPSERT } ) { details{items {status {id, code, message}}, operationStatus { code message }} } } }}"
     },
+    {
+      "name": "countries",
+      "operation": "sync",
+      "filter": "countries.yaml",
+      "mutation": "mutation{ master_data { country { Mutate( input: { items: ${resource_list}, totalCount: 0, mode: UPSERT } ) { details{items {status {id, code, message}},  operationStatus { code message }} } } }}"
+    },
+    {
+      "name": "contact_point_types",
+      "operation": "sync",
+      "filter": "contact_point_types.yaml",
+      "mutation": "mutation{ master_data { contact_point_type { Mutate( input: { items: ${resource_list}, totalCount: 0, mode: UPSERT } ) { details{items {status {id, code, message}}, operationStatus { code message } } } } }}"
+    },
     {
       "name": "tax_types",
       "operation": "sync",
@@ -47,10 +47,10 @@
       "mutation": "mutation mutateCommands($var: [IIoRestorecommerceCommandCommand!]!){ master_data { command { Mutate( input: { items: $var, totalCount: 0, mode: UPSERT } ) { details{items {status {id, code, message}}, operationStatus { code message }} } } }}"
     },
     {
-      "name": "contact_point_types",
+      "name": "organizations",
       "operation": "sync",
-      "filter": "contact_point_types.yaml",
-      "mutation": "mutation{ master_data { contact_point_type { Mutate( input: { items: ${resource_list}, totalCount: 0, mode: UPSERT } ) { details{items {status {id, code, message}}, operationStatus { code message } } } } }}"
+      "filter": "organizations.yaml",
+      "mutation": "mutation mutateOrganizations($var: [IIoRestorecommerceOrganizationOrganization!]!){ master_data { organization { Mutate( input: { items: $var, totalCount: 0, mode: UPSERT } ) { details{items {status {id, code, message}}, operationStatus { code message } } } } }}"
     }
   ]
 }
diff --git a/datasets/system/jobs/job_rules.json b/datasets/system/jobs/job_rules.json
index 2658952..e7aa7c8 100644
--- a/datasets/system/jobs/job_rules.json
+++ b/datasets/system/jobs/job_rules.json
@@ -1,6 +1,6 @@
 {
+  "base": "./datasets/system/data/seed-data/",
   "options": {
-    "base": "./datasets/system/data/seed-data/",
     "concurrency": 1
   },
   "tasks": [