diff --git a/package-lock.json b/package-lock.json
index cadfaa4..1d9d624 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -82,7 +82,8 @@
         "ts-node": "^10.9.1",
         "ts-node-dev": "^2.0.0",
         "tsconfig-paths": "^4.2.0",
-        "typescript": "^5.7.2"
+        "typescript": "^5.7.2",
+        "zod": "^3.22.4"
       }
     },
     "node_modules/@ampproject/remapping": {
@@ -19163,6 +19164,15 @@
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
+    },
+    "node_modules/zod": {
+      "version": "3.25.76",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz",
+      "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/colinhacks"
+      }
     }
   }
 }
diff --git a/src/app.module.ts b/src/app.module.ts
index 0e33b0d..ec6880e 100644
--- a/src/app.module.ts
+++ b/src/app.module.ts
@@ -58,33 +58,7 @@ import { EscrowsModule } from './modules/escrows/escrows.module';
       type: 'postgres',
       url: process.env.DATABASE_URL,
       ssl: process.env.DB_SSL === 'true' ? { rejectUnauthorized: false } : undefined,
-      entities: [
-        User,
-        Order,
-        OrderItem,
-        UserRole,
-        Role,
-        Notification,
-        Wishlist,
-        Product,
-        ProductType,
-        ProductVariant,
-        Attribute,
-        AttributeValue,
-        Coupon,
-        CouponUsage,
-        BuyerRequest,
-        Offer,
-        OfferAttachment,
-        EscrowAccount,
-        Milestone,
-
-  Escrow,
-  EscrowFundingTx,
-        Store,
-  Escrow,
-  Milestone,
-      ],
+  // entities property removed for modularization. Now entities are loaded via TypeOrmModule.forFeature in each feature module.
       synchronize: false,
       logging: process.env.NODE_ENV === 'development',
     }),