diff --git a/gdpr/db/data-privacy.cds b/gdpr/db/data-privacy.cds
index e4bddc5b..a505dee5 100644
--- a/gdpr/db/data-privacy.cds
+++ b/gdpr/db/data-privacy.cds
@@ -9,6 +9,7 @@ annotate bookshop.Customers with @PersonalData.EntitySemantics: 'DataSubject'
     firstName    @PersonalData.IsPotentiallyPersonal;
     lastName     @PersonalData.IsPotentiallyPersonal;
     creditCardNo @PersonalData.IsPotentiallySensitive;
+    dateOfBirth  @PersonalData.IsPotentiallyPersonal;
   }
 
 annotate bookshop.CustomerPostalAddress with @PersonalData.EntitySemantics: 'DataSubjectDetails' 
@@ -20,11 +21,12 @@ annotate bookshop.CustomerPostalAddress with @PersonalData.EntitySemantics: 'Dat
   }
 
 // annotations for Personal Data Manager - Search Fields
-annotate bookshop.Customers with @(Communication.Contact  : {
+annotate bookshop.Customers with @(Communication.Contact  : {    
     n : {
         surname: lastName,
         given:   firstName
-    },
+    },    
+    bday:  dateOfBirth,
     email: emailAddress
 }); 
 
diff --git a/gdpr/manifest.yml b/gdpr/manifest.yml
index e7d365dc..781600f0 100644
--- a/gdpr/manifest.yml
+++ b/gdpr/manifest.yml
@@ -13,6 +13,7 @@ applications:
   buildpack: nodejs_buildpack
   services:
   - gdpr-db
+  - uaa
 #  - name: pdm
 #    parameters: ./pdm-config.json 
 
diff --git a/gdpr/pdm-config.json b/gdpr/pdm-config.json
index 27f5f888..0ee52d99 100644
--- a/gdpr/pdm-config.json
+++ b/gdpr/pdm-config.json
@@ -10,7 +10,7 @@
       "serviceName": "pdm-service",
       "serviceTitle": "GDPR",
       "serviceTitleKey": "GDPR",
-      "serviceURI": "gdpr",
+      "serviceURI": "pdm",
       "hasGdprV4Annotations": true,
       "cacheControl": "no-cache"
     }
diff --git a/gdpr/services-manifest.yml b/gdpr/services-manifest.yml
index 5bf73acf..20573c7c 100644
--- a/gdpr/services-manifest.yml
+++ b/gdpr/services-manifest.yml
@@ -9,4 +9,8 @@ create-services:
   - name:   pdm
     broker: personal-data-manager-service  
     plan: standard
-    parameters: pdm-config-hugo.json
\ No newline at end of file
+    parameters: pdm-instance-config.json
+  - name:   uaa
+    broker: xsuaa
+    plan: application
+
diff --git a/gdpr/srv/pdm-service.cds b/gdpr/srv/pdm-service.cds
index 1fc17c78..6e1e27e6 100644
--- a/gdpr/srv/pdm-service.cds
+++ b/gdpr/srv/pdm-service.cds
@@ -24,7 +24,7 @@ using { sap.capire.bookshop.OrderItems } from '@capire/orders';
                      Items.netAmount as Item_NetAmount};
   
  //  annotate new view 
-     annotate PDMService.OrderItemView with @(PersonalData.EntitySemantics: 'ContractRelated')
+     annotate PDMService.OrderItemView with @(PersonalData.EntitySemantics: 'LegalGround')
            {
               Customer_ID    @PersonalData.FieldSemantics: 'DataSubjectID';
               Customer_Email @PersonalData.IsPotentiallyPersonal;