diff --git a/bookstore/package.json b/bookstore/package.json
index d4b2dc02..216156e6 100644
--- a/bookstore/package.json
+++ b/bookstore/package.json
@@ -15,13 +15,24 @@
         "kind": "odata",
         "model": "@capire/reviews"
       },
-      "messaging": {
-        "[production]": { "kind": "enterprise-messaging" },
-        "[hybrid]": { "kind": "enterprise-messaging-shared" },
-        "[local]": { "kind": "file-based-messaging" },
-        "kind": "local-messaging"
+      "OrdersService": {
+        "kind": "odata",
+        "model": "@capire/orders"
       },
-      "db": { "kind": "sql" }
+      "messaging": {
+        "[development]": { "kind": "file-based-messaging" },
+        "[hybrid]": { "kind": "enterprise-messaging-shared" },
+        "[production]": { "kind": "enterprise-messaging" }
+      },
+      "db": {
+        "kind": "sql",
+        "[development]": {
+          "model": "db/sqlite"
+        },
+        "[production]": {
+          "model": "db/hana"
+        }
+      }
     },
     "log": { "service": true }
   }
diff --git a/bookstore/server.js b/bookstore/server.js
index 0fe21fcd..638d9c52 100644
--- a/bookstore/server.js
+++ b/bookstore/server.js
@@ -15,3 +15,7 @@ require('./srv/swagger-ui')
 
 // Returning cds.server
 module.exports = cds.server
+
+// For didactic reasons in capire
+const { ReviewsService, OrdersService } = cds.requires
+if (!ReviewsService.credentials && !OrdersService.credentials) cds.requires.messaging = false
diff --git a/bookstore/srv/mashup.js b/bookstore/srv/mashup.js
index e2fe7388..bd8aa0f9 100644
--- a/bookstore/srv/mashup.js
+++ b/bookstore/srv/mashup.js
@@ -20,7 +20,7 @@ module.exports = async()=>{ // called by server.js
   CatalogService.prepend (srv => srv.on ('READ', 'Books/reviews', (req) => {
     console.debug ('> delegating request to ReviewsService')
     const [id] = req.params, { columns, limit } = req.query.SELECT
-    return ReviewsService.tx(req).read ('Reviews',columns).limit(limit).where({subject:String(id)})
+    return ReviewsService.read ('Reviews',columns).limit(limit).where({subject:String(id)})
   }))
 
   //
@@ -37,13 +37,12 @@ module.exports = async()=>{ // called by server.js
   })
 
   //
-  // Update Books' average ratings when ReviewsService signals updatd reviews
+  // Update Books' average ratings when ReviewsService signals updated reviews
   //
   ReviewsService.on ('reviewed', (msg) => {
     console.debug ('> received:', msg.event, msg.data)
     const { subject, count, rating } = msg.data
     return UPDATE(Books,subject).with({ numberOfReviews:count, rating })
-    // ^ Note: the framework will execute this and take care for db.tx
   })
 
   //
diff --git a/fiori/package.json b/fiori/package.json
index 50fc25f5..cf2f5ce1 100644
--- a/fiori/package.json
+++ b/fiori/package.json
@@ -24,26 +24,10 @@
         "kind": "odata",
         "model": "@capire/orders"
       },
-      "db": {
-        "kind": "sql",
-        "[development]": {
-          "model": "db/sqlite"
-        },
-        "[production]": {
-          "model": "db/hana"
-        }
-      },
       "messaging": {
-        "[production]": {
-          "kind": "enterprise-messaging"
-        },
-        "[hybrid]": {
-          "kind": "enterprise-messaging-shared"
-        },
-        "[local]": {
-          "kind": "file-based-messaging"
-        },
-        "kind": "local-messaging"
+        "[production]": { "kind": "enterprise-messaging" },
+        "[development]": { "kind": "file-based-messaging" },
+        "[hybrid!]": { "kind": "enterprise-messaging-shared" }
       },
       "hana": {
         "deploy-format": "hdbtable"
diff --git a/reviews/package.json b/reviews/package.json
index 4cf7cc8a..e1402494 100644
--- a/reviews/package.json
+++ b/reviews/package.json
@@ -10,17 +10,12 @@
     "@sap/cds": "^5",
     "express": "^4.17.1"
   },
-  "scripts": {
-    "reviews-service": "cds watch",
-    "books-reviewed": "cds watch ../reviewed"
-  },
   "cds": {
     "requires": {
       "messaging": {
-        "[production]": { "kind": "enterprise-messaging" },
+        "[development]": { "kind": "file-based-messaging" },
         "[hybrid]": { "kind": "enterprise-messaging-shared" },
-        "[local]": { "kind": "file-based-messaging" },
-        "kind": "local-messaging"
+        "[production]": { "kind": "enterprise-messaging" }
       },
       "db": { "kind": "sql" }
     }