diff --git a/multitenancy/package-lock.json b/multitenancy/package-lock.json
index 231ea8a6..94f41155 100644
--- a/multitenancy/package-lock.json
+++ b/multitenancy/package-lock.json
@@ -9,7 +9,7 @@
       "license": "UNLICENSED",
       "dependencies": {
         "@sap/cds": "5.0.6",
-        "@sap/cds-mtx": "1.2.1",
+        "@sap/cds-mtx": "git+https://github.wdf.sap.corp/cdx/cds-mtx.git#dev/linterSampleTest",
         "@sap/hana-client": "^2",
         "@sap/hdi-deploy": "^4",
         "@sap/instance-manager": "^2",
@@ -102,9 +102,10 @@
       }
     },
     "node_modules/@sap/cds-foss": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@sap/cds-foss/-/cds-foss-2.3.0.tgz",
-      "integrity": "sha512-KL5qKna1TaW2KT2HmPxsU7zVjwMUJmA0wsi4aAt0LPTZcdvEK0OXEmC4fTHX1z3jNG8CjLtZbAqPpWBlRabfQA==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/@sap/cds-foss/-/cds-foss-2.3.1.tgz",
+      "integrity": "sha512-Scfvem8T7YFBJE2Ruphrl/YVBUah8kYtaSyhiCh7N3+Vop4vx09WWysa1geOT1hholbZL3UCZ87w5R+0wKMEoA==",
+      "hasShrinkwrap": true,
       "dependencies": {
         "big.js": "6.0.3",
         "fs-extra": "9.1.0",
@@ -114,34 +115,55 @@
         "yaml": "1.10.2"
       }
     },
-    "node_modules/@sap/cds-mtx": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@sap/cds-mtx/-/cds-mtx-1.2.1.tgz",
-      "integrity": "sha512-mgwntRjdg9GhnOmPnU+Arvj5/WE9Dc3ZQGswpaaF5/KeS7g2KSgzH3oDizsrUTPZCSPdkC4kgdL0QVoVYNh+mQ==",
-      "dependencies": {
-        "fs-extra": "9.0.1"
-      }
+    "node_modules/@sap/cds-foss/node_modules/at-least-node": {
+      "version": "1.0.0"
     },
-    "node_modules/@sap/cds-mtx/node_modules/fs-extra": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.1.tgz",
-      "integrity": "sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==",
+    "node_modules/@sap/cds-foss/node_modules/big.js": {
+      "version": "6.0.3"
+    },
+    "node_modules/@sap/cds-foss/node_modules/fs-extra": {
+      "version": "9.1.0",
       "dependencies": {
         "at-least-node": "^1.0.0",
         "graceful-fs": "^4.2.0",
         "jsonfile": "^6.0.1",
-        "universalify": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "universalify": "^2.0.0"
       }
     },
-    "node_modules/@sap/cds-mtx/node_modules/universalify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz",
-      "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==",
-      "engines": {
-        "node": ">= 10.0.0"
+    "node_modules/@sap/cds-foss/node_modules/generic-pool": {
+      "version": "3.7.2"
+    },
+    "node_modules/@sap/cds-foss/node_modules/graceful-fs": {
+      "version": "4.2.6"
+    },
+    "node_modules/@sap/cds-foss/node_modules/jsonfile": {
+      "version": "6.1.0",
+      "dependencies": {
+        "graceful-fs": "^4.1.6",
+        "universalify": "^2.0.0"
+      }
+    },
+    "node_modules/@sap/cds-foss/node_modules/universalify": {
+      "version": "2.0.0"
+    },
+    "node_modules/@sap/cds-foss/node_modules/uuid": {
+      "version": "8.3.2"
+    },
+    "node_modules/@sap/cds-foss/node_modules/xmlbuilder": {
+      "version": "15.1.1"
+    },
+    "node_modules/@sap/cds-foss/node_modules/yaml": {
+      "version": "1.10.2"
+    },
+    "node_modules/@sap/cds-mtx": {
+      "version": "2.0.2",
+      "resolved": "git+https://github.wdf.sap.corp/cdx/cds-mtx.git#116976860eb60417f484b73d9152b725bbad3065",
+      "license": "SEE LICENSE IN LICENSE",
+      "dependencies": {
+        "@sap/cds-foss": "^2.3.1",
+        "@sap/hdi-deploy": "^4.0.5",
+        "@sap/instance-manager": "^2.2.0",
+        "fs-extra": "^9.1.0"
       }
     },
     "node_modules/@sap/cds-runtime": {
@@ -2714,9 +2736,9 @@
       }
     },
     "@sap/cds-foss": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@sap/cds-foss/-/cds-foss-2.3.0.tgz",
-      "integrity": "sha512-KL5qKna1TaW2KT2HmPxsU7zVjwMUJmA0wsi4aAt0LPTZcdvEK0OXEmC4fTHX1z3jNG8CjLtZbAqPpWBlRabfQA==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/@sap/cds-foss/-/cds-foss-2.3.1.tgz",
+      "integrity": "sha512-Scfvem8T7YFBJE2Ruphrl/YVBUah8kYtaSyhiCh7N3+Vop4vx09WWysa1geOT1hholbZL3UCZ87w5R+0wKMEoA==",
       "requires": {
         "big.js": "6.0.3",
         "fs-extra": "9.1.0",
@@ -2724,34 +2746,60 @@
         "uuid": "8.3.2",
         "xmlbuilder": "15.1.1",
         "yaml": "1.10.2"
-      }
-    },
-    "@sap/cds-mtx": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@sap/cds-mtx/-/cds-mtx-1.2.1.tgz",
-      "integrity": "sha512-mgwntRjdg9GhnOmPnU+Arvj5/WE9Dc3ZQGswpaaF5/KeS7g2KSgzH3oDizsrUTPZCSPdkC4kgdL0QVoVYNh+mQ==",
-      "requires": {
-        "fs-extra": "9.0.1"
       },
       "dependencies": {
+        "at-least-node": {
+          "version": "1.0.0"
+        },
+        "big.js": {
+          "version": "6.0.3"
+        },
         "fs-extra": {
-          "version": "9.0.1",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.1.tgz",
-          "integrity": "sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==",
+          "version": "9.1.0",
           "requires": {
             "at-least-node": "^1.0.0",
             "graceful-fs": "^4.2.0",
             "jsonfile": "^6.0.1",
-            "universalify": "^1.0.0"
+            "universalify": "^2.0.0"
+          }
+        },
+        "generic-pool": {
+          "version": "3.7.2"
+        },
+        "graceful-fs": {
+          "version": "4.2.6"
+        },
+        "jsonfile": {
+          "version": "6.1.0",
+          "requires": {
+            "graceful-fs": "^4.1.6",
+            "universalify": "^2.0.0"
           }
         },
         "universalify": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz",
-          "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug=="
+          "version": "2.0.0"
+        },
+        "uuid": {
+          "version": "8.3.2"
+        },
+        "xmlbuilder": {
+          "version": "15.1.1"
+        },
+        "yaml": {
+          "version": "1.10.2"
         }
       }
     },
+    "@sap/cds-mtx": {
+      "version": "git+https://github.wdf.sap.corp/cdx/cds-mtx.git#116976860eb60417f484b73d9152b725bbad3065",
+      "from": "@sap/cds-mtx@git+https://github.wdf.sap.corp/cdx/cds-mtx.git#dev/linterSampleTest",
+      "requires": {
+        "@sap/cds-foss": "^2.3.1",
+        "@sap/hdi-deploy": "^4.0.5",
+        "@sap/instance-manager": "^2.2.0",
+        "fs-extra": "^9.1.0"
+      }
+    },
     "@sap/cds-runtime": {
       "version": "3.0.8",
       "resolved": "https://registry.npmjs.org/@sap/cds-runtime/-/cds-runtime-3.0.8.tgz",
@@ -3015,8 +3063,7 @@
       }
     },
     "big.js": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-6.0.3.tgz",
+      "version": "https://registry.npmjs.org/big.js/-/big.js-6.0.3.tgz",
       "integrity": "sha512-n6yn1FyVL1EW2DBAr4jlU/kObhRzmr+NNRESl65VIOT8WBJj/Kezpx2zFdhJUqYI6qrtTW7moCStYL5VxeVdPA=="
     },
     "bignumber.js": {
@@ -3503,8 +3550,7 @@
       }
     },
     "generic-pool": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-3.7.2.tgz",
+      "version": "https://registry.npmjs.org/generic-pool/-/generic-pool-3.7.2.tgz",
       "integrity": "sha512-Ec7D4KySmEtIdJBNRVS8jus84ejNAvYG7KaLsXMhIs4AVQ2RuXSjMtmpskTKDT0y6TFSPjo4H+cCmLKUb+vDzg=="
     },
     "getpass": {
@@ -4777,8 +4823,7 @@
       "dev": true
     },
     "xmlbuilder": {
-      "version": "15.1.1",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz",
+      "version": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz",
       "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg=="
     },
     "yallist": {
@@ -4787,8 +4832,7 @@
       "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
     },
     "yaml": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+      "version": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
       "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="
     }
   }
diff --git a/multitenancy/package.json b/multitenancy/package.json
index 40eb9758..5ad8d3c3 100644
--- a/multitenancy/package.json
+++ b/multitenancy/package.json
@@ -72,6 +72,10 @@
         "deploy-format": "hdbtable"
       },
       "mtx": {
+        "element-prefix": [
+          "Z_",
+          "ZZ_"
+        ],
         "namespace-blocklist": [
           "com.sap.",
           "sap."
diff --git a/multitenancy/tpl/db/simple_field_extension.cds b/multitenancy/tpl/db/simple_field_extension.cds
new file mode 100644
index 00000000..27238f73
--- /dev/null
+++ b/multitenancy/tpl/db/simple_field_extension.cds
@@ -0,0 +1,21 @@
+using {sap.capire.bookshop} from '_base/db/schema';
+using {sap.capire.orders}   from '_base/db/schema';
+using from '_base/db/capire_common';
+
+using {
+    cuid, managed, Country, sap.common.CodeList
+} from '@sap/cds/common';
+
+
+namespace Z_bookshop.extension;
+
+// extend existing entity 
+extend orders.Orders with { 
+  Z_newDefaultField   : String   default 'Default Value';
+  Z_description       : String;  
+  Z_dateField         : Date;
+  Z_integerField      : Integer;  
+  Z_stringField       : String;
+  Z_enumField         : String   @assert.range enum {high; medium; low} default 'medium';
+  Z_rangeField        : Decimal  @assert.range: [ 1.0, 100.0 ]          default 50.0;
+}