diff --git a/gdpr/db/data/sap.capire.bookshop-Customers.csv b/gdpr/db/data/sap.capire.bookshop-Customers.csv
index e0a126aa..c94c4431 100644
--- a/gdpr/db/data/sap.capire.bookshop-Customers.csv
+++ b/gdpr/db/data/sap.capire.bookshop-Customers.csv
@@ -1,3 +1,3 @@
-ID;modifiedAt;createdAt;createdBy;modifiedBy;Email;FirstName;LastName;CreditCardNo;dateOfBirth
+ID;modifiedAt;createdAt;createdBy;modifiedBy;email;firstName;lastName;creditCardNo;dateOfBirth
 8e2f2640-6866-4dcf-8f4d-3027aa831cad;2019-04-04;2019-01-31;admin@business.com;admin@business.com;john.doe@test.com;John;Doe;9977-6655-4433-2211;1970-01-01
 74e718c9-ff99-47f1-8ca3-950c850777d4;2019-04-04;2019-01-30;admin@business.com;admin@business.com;jane.doe@sap.com;Jane;Doe;2211-3344-5566-7788;1980-11-11
\ No newline at end of file
diff --git a/gdpr/db/data/sap.capire.bookshop-OrderItems.csv b/gdpr/db/data/sap.capire.bookshop-OrderItems.csv
new file mode 100644
index 00000000..32569749
--- /dev/null
+++ b/gdpr/db/data/sap.capire.bookshop-OrderItems.csv
@@ -0,0 +1,4 @@
+ID;amount;parent_ID;book_ID;netAmount
+78040e66-1dcd-4ffb-ab10-fdce32028b79;1;5e2f2640-6866-4dcf-8f4d-3027aa831cad;201;11.11
+84e718c9-ff99-47f1-8ca3-950c850777d4;1;5e2f2640-6866-4dcf-8f4d-3027aa831cad;271;15
+f9641166-e050-4261-bfee-d1e797e6cb7f;2;44e718c9-ff99-47f1-8ca3-950c850777d4;252;28
\ No newline at end of file
diff --git a/gdpr/db/data/sap.capire.bookshop-Orders.csv b/gdpr/db/data/sap.capire.bookshop-Orders.csv
index 64117b09..9debcc79 100644
--- a/gdpr/db/data/sap.capire.bookshop-Orders.csv
+++ b/gdpr/db/data/sap.capire.bookshop-Orders.csv
@@ -1,3 +1,3 @@
-ID;modifiedAt;createdAt;createdBy;modifiedBy;OrderNo;Customer_ID;currency_code
-7e2f2640-6866-4dcf-8f4d-3027aa831cad;2019-04-04;2019-01-31;john.doe@test.com;john.doe@test.com;1;8e2f2640-6866-4dcf-8f4d-3027aa831cad;USD
-64e718c9-ff99-47f1-8ca3-950c850777d4;2019-04-04;2019-01-30;jane.doe@test.com;jane.doe@test.com;2;74e718c9-ff99-47f1-8ca3-950c850777d4;USD
\ No newline at end of file
+ID;modifiedAt;createdAt;createdBy;modifiedBy;OrderNo;currency_code;Customer_ID
+5e2f2640-6866-4dcf-8f4d-3027aa831cad;2019-04-04;2019-01-31;john.doe@test.com;john.doe@test.com;1;USD;8e2f2640-6866-4dcf-8f4d-3027aa831cad;
+44e718c9-ff99-47f1-8ca3-950c850777d4;2019-04-04;2019-01-30;jane.doe@test.com;jane.doe@test.com;2;USD;74e718c9-ff99-47f1-8ca3-950c850777d4;
\ No newline at end of file
diff --git a/gdpr/db/schema.cds b/gdpr/db/schema.cds
index a8462360..6af9a5a2 100644
--- a/gdpr/db/schema.cds
+++ b/gdpr/db/schema.cds
@@ -12,9 +12,9 @@ extend Orders with {
 
 entity Customers : managed {
   key ID : UUID;
-  Email : String;
-  FirstName : String;
-  LastName : String;
-  CreditCardNo : String;
+  email : String;
+  firstName : String;
+  lastName : String;
+  creditCardNo : String;
   dateOfBirth  : Date;
 }
\ No newline at end of file
diff --git a/gdpr/srv/pdm-service.cds b/gdpr/srv/pdm-service.cds
index d0fc57e6..120346b5 100644
--- a/gdpr/srv/pdm-service.cds
+++ b/gdpr/srv/pdm-service.cds
@@ -11,11 +11,11 @@ using { sap.capire.bookshop.OrderItems } from '@capire/orders';
 
      entity OrderItemView as
      SELECT from Orders
-                   { //key ID,
-                     //key Items.ID as Item_ID,
+                   { key ID,
+                     key Items.ID as Item_ID,
                      OrderNo,
                      Customer.ID as Customer_ID,
-                     Customer.Email as Customer_Email,
+                     Customer.email as Customer_Email,
                      Items.book.ID as Item_Book_ID,
                      Items.amount as Item_Amount,
                      Items.netAmount as Item_NetAmount};
diff --git a/orders/db/data/_sap.capire.bookshop-Orders.csv b/orders/db/data/sap.capire.bookshop-Orders.csv
similarity index 100%
rename from orders/db/data/_sap.capire.bookshop-Orders.csv
rename to orders/db/data/sap.capire.bookshop-Orders.csv