diff --git a/package.json b/package.json
index 6a1d2d69e..8dd17b6e7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "zenstack-monorepo",
-    "version": "1.0.0-beta.22",
+    "version": "1.0.0-beta.23",
     "description": "",
     "scripts": {
         "build": "pnpm -r build",
diff --git a/packages/language/package.json b/packages/language/package.json
index 44f3e3989..a16d6b364 100644
--- a/packages/language/package.json
+++ b/packages/language/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/language",
-    "version": "1.0.0-beta.22",
+    "version": "1.0.0-beta.23",
     "displayName": "ZenStack modeling language compiler",
     "description": "ZenStack modeling language compiler",
     "homepage": "https://zenstack.dev",
diff --git a/packages/plugins/openapi/package.json b/packages/plugins/openapi/package.json
index 8afe590da..ec1d9cb47 100644
--- a/packages/plugins/openapi/package.json
+++ b/packages/plugins/openapi/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@zenstackhq/openapi",
   "displayName": "ZenStack Plugin and Runtime for OpenAPI",
-  "version": "1.0.0-beta.22",
+  "version": "1.0.0-beta.23",
   "description": "ZenStack plugin and runtime supporting OpenAPI",
   "main": "index.js",
   "repository": {
diff --git a/packages/plugins/swr/package.json b/packages/plugins/swr/package.json
index 0311eee85..1b99f4e1c 100644
--- a/packages/plugins/swr/package.json
+++ b/packages/plugins/swr/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/swr",
     "displayName": "ZenStack plugin for generating SWR hooks",
-    "version": "1.0.0-beta.22",
+    "version": "1.0.0-beta.23",
     "description": "ZenStack plugin for generating SWR hooks",
     "main": "index.js",
     "repository": {
diff --git a/packages/plugins/tanstack-query/package.json b/packages/plugins/tanstack-query/package.json
index eff25fdc8..28d0f1fbb 100644
--- a/packages/plugins/tanstack-query/package.json
+++ b/packages/plugins/tanstack-query/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/tanstack-query",
     "displayName": "ZenStack plugin for generating tanstack-query hooks",
-    "version": "1.0.0-beta.22",
+    "version": "1.0.0-beta.23",
     "description": "ZenStack plugin for generating tanstack-query hooks",
     "main": "index.js",
     "exports": {
diff --git a/packages/plugins/trpc/package.json b/packages/plugins/trpc/package.json
index b18897143..a5c3220f3 100644
--- a/packages/plugins/trpc/package.json
+++ b/packages/plugins/trpc/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/trpc",
     "displayName": "ZenStack plugin for tRPC",
-    "version": "1.0.0-beta.22",
+    "version": "1.0.0-beta.23",
     "description": "ZenStack plugin for tRPC",
     "main": "index.js",
     "repository": {
diff --git a/packages/runtime/package.json b/packages/runtime/package.json
index dadbca61f..d16660ec2 100644
--- a/packages/runtime/package.json
+++ b/packages/runtime/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/runtime",
     "displayName": "ZenStack Runtime Library",
-    "version": "1.0.0-beta.22",
+    "version": "1.0.0-beta.23",
     "description": "Runtime of ZenStack for both client-side and server-side environments.",
     "repository": {
         "type": "git",
diff --git a/packages/runtime/src/loader.ts b/packages/runtime/src/loader.ts
index 0b90a5b26..1c2eef7bd 100644
--- a/packages/runtime/src/loader.ts
+++ b/packages/runtime/src/loader.ts
@@ -1,6 +1,5 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 import path from 'path';
-import { DEFAULT_RUNTIME_LOAD_PATH } from './constants';
 import { ModelMeta, PolicyDef, ZodSchemas } from './enhancements';
 
 /**
@@ -10,15 +9,18 @@ import { ModelMeta, PolicyDef, ZodSchemas } from './enhancements';
  * will use default load path.
  */
 export function getDefaultModelMeta(loadPath: string | undefined): ModelMeta {
-    const toLoad = loadPath ? path.resolve(loadPath, 'model-meta') : `${DEFAULT_RUNTIME_LOAD_PATH}/model-meta`;
     try {
-        // normal load
-        return require(toLoad).default;
+        if (loadPath) {
+            const toLoad = path.resolve(loadPath, 'model-meta');
+            return require(toLoad).default;
+        } else {
+            return require('.zenstack/model-meta').default;
+        }
     } catch {
-        if (process.env.ZENSTACK_TEST === '1' && !path.isAbsolute(toLoad)) {
+        if (process.env.ZENSTACK_TEST === '1' && !loadPath) {
             try {
                 // special handling for running as tests, try resolving relative to CWD
-                return require(path.join(process.cwd(), 'node_modules', toLoad)).default;
+                return require(path.join(process.cwd(), 'node_modules', '.zenstack', 'model-meta')).default;
             } catch {
                 throw new Error('Model meta cannot be loaded. Please make sure "zenstack generate" has been run.');
             }
@@ -34,14 +36,18 @@ export function getDefaultModelMeta(loadPath: string | undefined): ModelMeta {
  * will use default load path.
  */
 export function getDefaultPolicy(loadPath: string | undefined): PolicyDef {
-    const toLoad = loadPath ? path.resolve(loadPath, 'policy') : `${DEFAULT_RUNTIME_LOAD_PATH}/policy`;
     try {
-        return require(toLoad).default;
+        if (loadPath) {
+            const toLoad = path.resolve(loadPath, 'policy');
+            return require(toLoad).default;
+        } else {
+            return require('.zenstack/policy').default;
+        }
     } catch {
-        if (process.env.ZENSTACK_TEST === '1' && !path.isAbsolute(toLoad)) {
+        if (process.env.ZENSTACK_TEST === '1' && !loadPath) {
             try {
                 // special handling for running as tests, try resolving relative to CWD
-                return require(path.join(process.cwd(), 'node_modules', toLoad)).default;
+                return require(path.join(process.cwd(), 'node_modules', '.zenstack', 'policy')).default;
             } catch {
                 throw new Error(
                     'Policy definition cannot be loaded from default location. Please make sure "zenstack generate" has been run.'
@@ -61,14 +67,18 @@ export function getDefaultPolicy(loadPath: string | undefined): PolicyDef {
  * will use default load path.
  */
 export function getDefaultZodSchemas(loadPath: string | undefined): ZodSchemas | undefined {
-    const toLoad = loadPath ? path.resolve(loadPath, 'zod') : `${DEFAULT_RUNTIME_LOAD_PATH}/zod`;
     try {
-        return require(toLoad);
+        if (loadPath) {
+            const toLoad = path.resolve(loadPath, 'zod');
+            return require(toLoad);
+        } else {
+            return require('.zenstack/zod');
+        }
     } catch {
-        if (process.env.ZENSTACK_TEST === '1' && !path.isAbsolute(toLoad)) {
+        if (process.env.ZENSTACK_TEST === '1' && !loadPath) {
             try {
                 // special handling for running as tests, try resolving relative to CWD
-                return require(path.join(process.cwd(), 'node_modules', toLoad));
+                return require(path.join(process.cwd(), 'node_modules', '.zenstack', 'zod'));
             } catch {
                 return undefined;
             }
diff --git a/packages/schema/package.json b/packages/schema/package.json
index a8a6d1425..3b752d362 100644
--- a/packages/schema/package.json
+++ b/packages/schema/package.json
@@ -3,7 +3,7 @@
     "publisher": "zenstack",
     "displayName": "ZenStack Language Tools",
     "description": "A toolkit for building secure CRUD apps with Next.js + Typescript",
-    "version": "1.0.0-beta.22",
+    "version": "1.0.0-beta.23",
     "author": {
         "name": "ZenStack Team"
     },
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 5417ef3b7..281e3ad3b 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/sdk",
-    "version": "1.0.0-beta.22",
+    "version": "1.0.0-beta.23",
     "description": "ZenStack plugin development SDK",
     "main": "index.js",
     "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index 9e9a53c55..627e9760a 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/server",
-    "version": "1.0.0-beta.22",
+    "version": "1.0.0-beta.23",
     "displayName": "ZenStack Server-side Adapters",
     "description": "ZenStack server-side adapters",
     "homepage": "https://zenstack.dev",
diff --git a/packages/testtools/package.json b/packages/testtools/package.json
index 1d28ed278..e0b27f666 100644
--- a/packages/testtools/package.json
+++ b/packages/testtools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zenstackhq/testtools",
-  "version": "1.0.0-beta.22",
+  "version": "1.0.0-beta.23",
   "description": "ZenStack Test Tools",
   "main": "index.js",
   "publishConfig": {