diff --git a/data/data.surrealql b/data/data.surrealql
index 25d4b03..d0fddb1 100644
--- a/data/data.surrealql
+++ b/data/data.surrealql
@@ -1,559 +1,379 @@
-CREATE Customer:2001 CONTENT {
+CREATE Customer CONTENT {
     last_name: 'Wellensteyn',
     first_name: 'Kira',
     birth_date: '1990-05-05',
-    phone: '040/443322',
-    email: 'k.wellensteyn@yahoo.de',
-    address: 'Address:2001'
-};
-
-CREATE Address:2001 CONTENT {
     street: 'Eppendorfer Landstrasse',
     house_number: '104',
     postal_code: '20249',
-    city: 'Hamburg'
+    city: 'Hamburg',
+    phone: '040/443322',
+    email: 'k.wellensteyn@yahoo.de'
 };
 
-CREATE Customer:2002 CONTENT {
+CREATE Customer CONTENT {
     last_name: 'Foede',
     first_name: 'Dorothea',
     birth_date: '2000-03-24',
-    phone: '040/543822',
-    email: 'd.foede@web.de',
-    address: 'Address:2002'
-};
-
-CREATE Address:2002 CONTENT {
     street: 'Ohmstraße',
     house_number: '23',
     postal_code: '22765',
-    city: 'Hamburg'
+    city: 'Hamburg',
+    phone: '040/543822',
+    email: 'd.foede@web.de'
 };
 
-CREATE Customer:2003 CONTENT {
+CREATE Customer CONTENT {
     last_name: 'Leberer',
     first_name: 'Sigrid',
     birth_date: '1989-09-21',
-    phone: '0175/1234588',
-    email: 'sigrid@leberer.de',
-    address: 'Address:2003'
-};
-
-CREATE Address:2003 CONTENT {
     street: 'Bilser Berg',
     house_number: '6',
     postal_code: '20459',
-    city: 'Hamburg'
+    city: 'Hamburg',
+    phone: '0175/1234588',
+    email: 'sigrid@leberer.de'
 };
 
-CREATE Customer:2004 CONTENT {
+CREATE Customer CONTENT {
     last_name: 'Soerensen',
     first_name: 'Hanna',
     birth_date: '1974-04-03',
-    phone: '040/634578',
-    email: 'h.soerensen@yahoo.de',
-    address: 'Address:2004'
-};
-
-CREATE Address:2004 CONTENT {
     street: 'Alter Teichweg',
     house_number: '95',
     postal_code: '22049',
-    city: 'Hamburg'
+    city: 'Hamburg',
+    phone: '040/634578',
+    email: 'h.soerensen@yahoo.de'
 };
 
-CREATE Customer:2005 CONTENT {
+CREATE Customer CONTENT {
     last_name: 'Schnitter',
     first_name: 'Marten',
     birth_date: '1964-04-17',
-    phone: '0176/447587',
-    email: 'schni_mart@gmail.com',
-    address: 'Address:2005'
-};
-
-CREATE Address:2005 CONTENT {
     street: 'Stübels',
     house_number: '10',
     postal_code: '22835',
-    city: 'Barsbüttel'
+    city: 'Barsbüttel',
+    phone: '0176/447587',
+    email: 'schni_mart@gmail.com'
 };
 
-CREATE Customer:2006 CONTENT {
+CREATE Customer CONTENT {
     last_name: 'Maurer',
     first_name: 'Belinda',
     birth_date: '1978-09-09',
-    phone: '040/332189',
-    email: 'belinda1978@yahoo.de',
-    address: 'Address:2006'
-};
-
-CREATE Address:2006 CONTENT {
     street: 'Grotelertwiete',
     house_number: '4a',
     postal_code: '21075',
-    city: 'Hamburg'
+    city: 'Hamburg',
+    phone: '040/332189',
+    email: 'belinda1978@yahoo.de'
 };
 
-CREATE Customer:2007 CONTENT {
+CREATE Customer CONTENT {
     last_name: 'Gessert',
     first_name: 'Armin',
     birth_date: '1978-01-29',
-    phone: '040/67890',
-    email: 'armin@gessert.de',
-    address: 'Address:2007'
-};
-
-CREATE Address:2007 CONTENT {
     street: 'Küstersweg',
     house_number: '3',
     postal_code: '21079',
-    city: 'Hamburg'
+    city: 'Hamburg',
+    phone: '040/67890',
+    email: 'armin@gessert.de'
 };
 
-CREATE Customer:2008 CONTENT {
+CREATE Customer CONTENT {
     last_name: 'Haessig',
     first_name: 'Jean-Marc',
     birth_date: '1982-08-30',
-    phone: '0178-67013390',
-    email: 'jm@haessig.de',
-    address: 'Address:2008'
-};
-
-CREATE Address:2008 CONTENT {
     street: 'Neugrabener Bahnhofstraße',
     house_number: '30',
     postal_code: '21149',
-    city: 'Hamburg'
+    city: 'Hamburg',
+    phone: '0178-67013390',
+    email: 'jm@haessig.de'
 };
 
-CREATE Customer:2009 CONTENT {
+CREATE Customer CONTENT {
     last_name: 'Urocki',
     first_name: 'Eric',
     birth_date: '1999-12-04',
-    phone: '0152-96701390',
-    email: 'urocki@outlook.de',
-    address: 'Address:2009'
-};
-
-CREATE Address:2009 CONTENT {
     street: 'Elbchaussee',
     house_number: '228',
     postal_code: '22605',
-    city: 'Hamburg'
+    city: 'Hamburg',
+    phone: '0152-96701390',
+    email: 'urocki@outlook.de'
 };
 
-CREATE Supplier:101 CONTENT {
+CREATE Supplier CONTENT {
     name: 'Bio-Hof Müller',
-    phone: '04354-9080',
-    email: 'mueller@biohof.de',
-    address: 'Address:101'
-};
-
-CREATE Address:101 CONTENT {
     street: 'Dorfstraße',
     house_number: '74',
     postal_code: '24354',
-    city: 'Weseby'
+    city: 'Weseby',
+    phone: '04354-9080',
+    email: 'mueller@biohof.de'
 };
 
-CREATE Supplier:102 CONTENT {
+CREATE Supplier CONTENT {
     name: 'Obst-Hof Altes Land',
-    phone: '04162-4523',
-    email: 'info@biohof-altesland.de',
-    address: 'Address:102'
-};
-
-CREATE Address:102 CONTENT {
     street: 'Westerjork 74',
     house_number: '76',
     postal_code: '21635',
-    city: 'Jork'
+    city: 'Jork',
+    phone: '04162-4523',
+    email: 'info@biohof-altesland.de'
 };
 
-CREATE Supplier:103 CONTENT {
+CREATE Supplier CONTENT {
     name: 'Molkerei Henning',
-    phone: '038873-8976',
-    email: 'info@molkerei-henning.de',
-    address: 'Address:103'
-};
-
-CREATE Address:103 CONTENT {
     street: 'Molkereiwegkundekunde',
     house_number: '13',
     postal_code: '19217',
-    city: 'Dechow'
+    city: 'Dechow',
+    phone: '038873-8976',
+    email: 'info@molkerei-henning.de'
 };
 
-CREATE Ingredient:1001 CONTENT {
+CREATE Ingredient CONTENT {
     designation: 'Zucchini',
     unit: 'Stück',
     net_price: 0.89,
     stock: 100,
+    supplier_id: 101,
     calories: 19,
     carbohydrates: 2,
     protein: 1.6
 };
 
-CREATE SupplierContainsIngredients CONTENT {
-    delivery_cost: 5.0,
-    delivery_time: 3,
-    supplier: 'Supplier:101',
-    ingredient: 'Ingredient:1001'
-};
-
-CREATE Ingredient:1002 CONTENT {
+CREATE Ingredient CONTENT {
     designation: 'Zwiebel',
     unit: 'Stück',
     net_price: 0.15,
     stock: 50,
+    supplier_id: 101,
     calories: 28,
     carbohydrates: 4.9,
     protein: 1.20
 };
 
-CREATE SupplierContainsIngredients CONTENT {
-    delivery_cost: 4.0,
-    delivery_time: 2,
-    supplier: 'Supplier:101',
-    ingredient: 'Ingredient:1002'
-};
-
-CREATE Ingredient:1003 CONTENT {
+CREATE Ingredient CONTENT {
     designation: 'Tomate',
     unit: 'Stück',
     net_price: 0.45,
     stock: 50,
+    supplier_id: 101,
     calories: 18,
     carbohydrates: 2.6,
     protein: 1
 };
 
-CREATE SupplierContainsIngredients CONTENT {
-    delivery_cost: 6.0,
-    delivery_time: 3,
-    supplier: 'Supplier:101',
-    ingredient: 'Ingredient:1003'
-};
-
-CREATE Ingredient:1004 CONTENT {
+CREATE Ingredient CONTENT {
     designation: 'Schalotte',
     unit: 'Stück',
     net_price: 0.20,
     stock: 500,
+    supplier_id: 101,
     calories: 25,
     carbohydrates: 3.3,
     protein: 1.5
 };
 
-CREATE SupplierContainsIngredients CONTENT {
-    delivery_cost: 3.5,
-    delivery_time: 2,
-    supplier: 'Supplier:101',
-    ingredient: 'Ingredient:1004'
-};
-
-CREATE Ingredient:1005 CONTENT {
+CREATE Ingredient CONTENT {
     designation: 'Karotte',
     unit: 'Stück',
     net_price: 0.30,
     stock: 500,
+    supplier_id: 101,
     calories: 41,
     carbohydrates: 10,
     protein: 0.9
 };
 
-CREATE SupplierContainsIngredients CONTENT {
-    delivery_cost: 4.0,
-    delivery_time: 3,
-    supplier: 'Supplier:101',
-    ingredient: 'Ingredient:1005'
-};
-
-CREATE Ingredient:1006 CONTENT {
+CREATE Ingredient CONTENT {
     designation: 'Kartoffel',
     unit: 'Stück',
     net_price: 0.15,
     stock: 1500,
+    supplier_id: 101,
     calories: 71,
     carbohydrates: 14.6,
     protein: 2
 };
 
-CREATE SupplierContainsIngredients CONTENT {
-    delivery_cost: 3.0,
-    delivery_time: 2,
-    supplier: 'Supplier:101',
-    ingredient: 'Ingredient:1006'
-};
-
-CREATE Ingredient:1007 CONTENT {
+CREATE Ingredient CONTENT {
     designation: 'Rucola',
     unit: 'Bund',
     net_price: 0.90,
     stock: 10,
+    supplier_id: 101,
     calories: 27,
     carbohydrates: 2.1,
     protein: 2.6
 };
 
-CREATE SupplierContainsIngredients CONTENT {
-    delivery_cost: 5.0,
-    delivery_time: 3,
-    supplier: 'Supplier:101',
-    ingredient: 'Ingredient:1007'
-};
-
-CREATE Ingredient:1008 CONTENT {
+CREATE Ingredient CONTENT {
     designation: 'Lauch',
     unit: 'Stück',
     net_price: 1.2,
     stock: 35,
+    supplier_id: 101,
     calories: 29,
     carbohydrates: 3.3,
     protein: 2.1
 };
 
-CREATE SupplierContainsIngredients CONTENT {
-    delivery_cost: 4.5,
-    delivery_time: 2,
-    supplier: 'Supplier:101',
-    ingredient: 'Ingredient:1008'
-};
-
-CREATE Ingredient:1009 CONTENT {
+CREATE Ingredient CONTENT {
     designation: 'Knoblauch',
     unit: 'Stück',
     net_price: 0.25,
     stock: 250,
+    supplier_id: 101,
     calories: 141,
     carbohydrates: 28.4,
     protein: 6.1
 };
 
-CREATE SupplierContainsIngredients CONTENT {
-    delivery_cost: 3.5,
-    delivery_time: 2,
-    supplier: 'Supplier:101',
-    ingredient: 'Ingredient:1009'
-};
-
-CREATE Ingredient:1010 CONTENT {
+CREATE Ingredient CONTENT {
     designation: 'Basilikum',
     unit: 'Bund',
     net_price: 1.3,
     stock: 10,
+    supplier_id: 101,
     calories: 41,
     carbohydrates: 5.1,
     protein: 3.1
 };
 
-CREATE SupplierContainsIngredients CONTENT {
-    delivery_cost: 5.5,
-    delivery_time: 3,
-    supplier: 'Supplier:101',
-    ingredient: 'Ingredient:1010'
-};
-
-CREATE Ingredient:1011 CONTENT {
+CREATE Ingredient CONTENT {
     designation: 'Süßkartoffel',
     unit: 'Stück',
     net_price: 2.0,
     stock: 200,
+    supplier_id: 101,
     calories: 86,
     carbohydrates: 20,
     protein: 1.6
 };
 
-CREATE SupplierContainsIngredients CONTENT {
-    delivery_cost: 6.0,
-    delivery_time: 3,
-    supplier: 'Supplier:101',
-    ingredient: 'Ingredient:1011'
-};
-
-CREATE Ingredient:1012 CONTENT {
+CREATE Ingredient CONTENT {
     designation: 'Schnittlauch',
     unit: 'Bund',
     net_price: 0.9,
     stock: 10,
+    supplier_id: 101,
     calories: 28,
     carbohydrates: 1,
     protein: 3
 };
 
-CREATE SupplierContainsIngredients CONTENT {
-    delivery_cost: 5.0,
-    delivery_time: 3,
-    supplier: 'Supplier:101',
-    ingredient: 'Ingredient:1012'
-};
-
-CREATE Ingredient:2001 CONTENT {
+CREATE Ingredient CONTENT {
     designation: 'Apfel',
     unit: 'Stück',
     net_price: 1.2,
     stock: 750,
+    supplier_id: 102,
     calories: 54,
     carbohydrates: 14.4,
     protein: 0.3
 };
 
-CREATE SupplierContainsIngredients CONTENT {
-    delivery_cost: 7.0,
-    delivery_time: 4,
-    supplier: 'Supplier:102',
-    ingredient: 'Ingredient:2001'
-};
-
-CREATE Ingredient:3001 CONTENT {
+CREATE Ingredient CONTENT {
     designation: 'Vollmilch. 3.5%',
     unit: 'Liter',
     net_price: 1.5,
     stock: 50,
+    supplier_id: 103,
     calories: 65,
     carbohydrates: 4.7,
     protein: 3.4
 };
 
-CREATE SupplierContainsIngredients CONTENT {
-    delivery_cost: 5.0,
-    delivery_time: 3,
-    supplier: 'Supplier:103',
-    ingredient: 'Ingredient:3001'
-};
-
-CREATE Ingredient:3002 CONTENT {
+CREATE Ingredient CONTENT {
     designation: 'Mozzarella',
     unit: 'Packung',
     net_price: 3.5,
     stock: 20,
+    supplier_id: 103,
     calories: 241,
     carbohydrates: 1,
     protein: 18.1
 };
 
-CREATE SupplierContainsIngredients CONTENT {
-    delivery_cost: 6.5,
-    delivery_time: 4,
-    supplier: 'Supplier:103',
-    ingredient: 'Ingredient:3002'
-};
-
-CREATE Ingredient:3003 CONTENT {
+CREATE Ingredient CONTENT {
     designation: 'Butter',
     unit: 'Stück',
     net_price: 3.0,
     stock: 50,
+    supplier_id: 103,
     calories: 741,
     carbohydrates: 0.6,
     protein: 0.7
 };
 
-CREATE SupplierContainsIngredients CONTENT {
-    delivery_cost: 7.0,
-    delivery_time: 4,
-    supplier: 'Supplier:103',
-    ingredient: 'Ingredient:3003'
-};
-
-CREATE Ingredient:4001 CONTENT {
+CREATE Ingredient CONTENT {
     designation: 'Ei',
     unit: 'Stück',
     net_price: 0.4,
     stock: 300,
+    supplier_id: 102,
     calories: 137,
     carbohydrates: 1.5,
     protein: 11.9
 };
 
-CREATE SupplierContainsIngredients CONTENT {
-    delivery_cost: 4.5,
-    delivery_time: 3,
-    supplier: 'Supplier:102',
-    ingredient: 'Ingredient:4001'
-};
-
-CREATE Ingredient:5001 CONTENT {
+CREATE Ingredient CONTENT {
     designation: 'Wiener Würstchen',
     unit: 'Paar',
     net_price: 1.8,
     stock: 40,
+    supplier_id: 101,
     calories: 331,
     carbohydrates: 1.2,
     protein: 9.9
 };
 
-CREATE SupplierContainsIngredients CONTENT {
-    delivery_cost: 6.0,
-    delivery_time: 4,
-    supplier: 'Supplier:101',
-    ingredient: 'Ingredient:5001'
-};
-
-CREATE Ingredient:9001 CONTENT {
+CREATE Ingredient CONTENT {
     designation: 'Tofu-Würstchen',
     unit: 'Stück',
     net_price: 1.8,
     stock: 20,
+    supplier_id: 103,
     calories: 252,
     carbohydrates: 7,
     protein: 17
 };
 
-CREATE SupplierContainsIngredients CONTENT {
-    delivery_cost: 7.5,
-    delivery_time: 4,
-    supplier: 'Supplier:103',
-    ingredient: 'Ingredient:9001'
-};
-
-CREATE Ingredient:6408 CONTENT {
+CREATE Ingredient CONTENT {
     designation: 'Couscous',
     unit: 'Packung',
     net_price: 1.9,
     stock: 15,
+    supplier_id: 102,
     calories: 351,
     carbohydrates: 67,
     protein: 12
 };
 
-CREATE SupplierContainsIngredients CONTENT {
-    delivery_cost: 5.0,
-    delivery_time: 3,
-    supplier: 'Supplier:102',
-    ingredient: 'Ingredient:6408'
-};
-
-CREATE Ingredient:7043 CONTENT {
+CREATE Ingredient CONTENT {
     designation: 'Gemüsebrühe',
     unit: 'Würfel',
     net_price: 0.2,
     stock: 4000,
+    supplier_id: 101,
     calories: 1,
     carbohydrates: 0.5,
     protein: 0.5
 };
 
-CREATE SupplierContainsIngredients CONTENT {
-    delivery_cost: 3.0,
-    delivery_time: 2,
-    supplier: 'Supplier:101',
-    ingredient: 'Ingredient:7043'
-};
-
-CREATE Ingredient:6300 CONTENT {
+CREATE Ingredient CONTENT {
     designation: 'Kichererbsen',
     unit: 'Dose',
     net_price: 1.0,
     stock: 400,
+    supplier_id: 103,
     calories: 150,
     carbohydrates: 21.2,
     protein: 9
 };
-
-CREATE SupplierContainsIngredients CONTENT {
-    delivery_cost: 4.0,
-    delivery_time: 3,
-    supplier: 'Supplier:103',
-    ingredient: 'Ingredient:6300'
-};