diff --git a/packages/bookshop/req.http b/packages/bookshop/req.http
new file mode 100644
index 00000000..0be9cd90
--- /dev/null
+++ b/packages/bookshop/req.http
@@ -0,0 +1,6 @@
+PATCH  http://localhost:4004/api-business-partner/A_BusinessPartnerAddress(BusinessPartner='ANONYMOUS',AddressID='62640')
+Content-Type: application/json
+
+{
+    "PostalCode": "123456"
+}
diff --git a/packages/bookshop/srv/admin-service.js b/packages/bookshop/srv/admin-service.js
index 3d2e2b63..e3520a5c 100644
--- a/packages/bookshop/srv/admin-service.js
+++ b/packages/bookshop/srv/admin-service.js
@@ -14,7 +14,7 @@ const bupaSrv = cds.connect.to('API_BUSINESS_PARTNER')
 const messagingSrv = cds.connect.to('messaging')
 
 messagingSrv.on('sap/messaging/ccf/BO/BusinessPartner/Changed', async msg => {
-  console.log('>> MSG', msg.data)
+  console.log('>> Message:', msg.data)
   const BusinessPartner = msg.data.KEY[0].BUSINESSPARTNER
   // TODO: Remove toLower hack.
   // Every BusinessPartner from S/4HANA is UPPERCASE.
diff --git a/packages/bookshop/srv/external/API_BUSINESS_PARTNER.js b/packages/bookshop/srv/external/API_BUSINESS_PARTNER.js
new file mode 100644
index 00000000..951d0290
--- /dev/null
+++ b/packages/bookshop/srv/external/API_BUSINESS_PARTNER.js
@@ -0,0 +1,13 @@
+module.exports = srv => {
+
+    srv.on('UPDATE', req => {
+
+        const payload = {
+            KEY: [{ BUSINESSPARTNER: req.user.id }]
+        }
+        console.log('<< Message:', payload)
+        srv.emit('sap/messaging/ccf/BO/BusinessPartner/Changed', payload)
+
+    })
+
+}
\ No newline at end of file
diff --git a/packages/bookshop/srv/init.js b/packages/bookshop/srv/init.js
index 49dd313f..20bb4273 100644
--- a/packages/bookshop/srv/init.js
+++ b/packages/bookshop/srv/init.js
@@ -10,7 +10,7 @@ module.exports = db => {
       AddressID: '62640',
       CityName: 'Walldorf',
       PostalCode: '69190',
-      Country: 'Germany',
+      Country: 'GER',
       StreetName: 'Dietmar-Hopp-Allee',
       HouseNumber: '16'
     },
@@ -19,7 +19,7 @@ module.exports = db => {
       AddressID: '22222',
       CityName: 'St. Leon-Rot',
       PostalCode: '68789',
-      Country: 'Germany',
+      Country: 'GER',
       StreetName: 'SAP-Allee',
       HouseNumber: '25'
     },
@@ -28,7 +28,7 @@ module.exports = db => {
       AddressID: '62640',
       CityName: 'Walldorf',
       PostalCode: '69190',
-      Country: 'Germany',
+      Country: 'GER',
       StreetName: 'Dietmar-Hopp-Allee',
       HouseNumber: '16'
     },
@@ -37,7 +37,7 @@ module.exports = db => {
       AddressID: '22222',
       CityName: 'St. Leon-Rot',
       PostalCode: '68789',
-      Country: 'Germany',
+      Country: 'GER',
       StreetName: 'SAP-Allee',
       HouseNumber: '25'
     },
@@ -46,7 +46,7 @@ module.exports = db => {
       AddressID: '28241',
       CityName: 'Palo Alto',
       PostalCode: '94306',
-      Country: 'United States',
+      Country: 'USA',
       StreetName: 'Hillview Avenue',
       HouseNumber: '26'
     },
@@ -55,7 +55,7 @@ module.exports = db => {
       AddressID: '28244',
       CityName: 'Hallbergmoos',
       PostalCode: '85396',
-      Country: 'Germany',
+      Country: 'GER',
       StreetName: 'Zeppelinstraße',
       HouseNumber: '93'
     },
@@ -64,7 +64,7 @@ module.exports = db => {
       AddressID: '28247',
       CityName: 'Potsdam',
       PostalCode: '14467',
-      Country: 'Germany',
+      Country: 'GER',
       StreetName: 'Konrad-Zuse-Ring',
       HouseNumber: '29'
     }