diff --git a/package.json b/package.json
index 6a0295dab..8b898b107 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "zenstack-monorepo",
-    "version": "1.0.0-beta.1",
+    "version": "1.0.0-beta.2",
     "description": "",
     "scripts": {
         "build": "pnpm -r build",
diff --git a/packages/language/package.json b/packages/language/package.json
index bd7632215..a7a1d896a 100644
--- a/packages/language/package.json
+++ b/packages/language/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/language",
-    "version": "1.0.0-beta.1",
+    "version": "1.0.0-beta.2",
     "displayName": "ZenStack modeling language compiler",
     "description": "ZenStack modeling language compiler",
     "homepage": "https://zenstack.dev",
diff --git a/packages/next/README.md b/packages/next/README.md
index 214303860..1447c7630 100644
--- a/packages/next/README.md
+++ b/packages/next/README.md
@@ -1,5 +1,7 @@
 # ZenStack Next.js Library
 
+**This package is deprecated. Please use `@zenstackhq/server` package instead.**
+
 This package is the runtime library for integrating ZenStack with Next.js.
 
 Visit [Homepage](https://zenstack.dev) for more details.
diff --git a/packages/next/package.json b/packages/next/package.json
index c47384f66..e4b08d0b0 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/next",
-    "version": "1.0.0-beta.1",
+    "version": "1.0.0-beta.2",
     "displayName": "ZenStack Next.js integration",
     "description": "ZenStack Next.js integration",
     "homepage": "https://zenstack.dev",
diff --git a/packages/plugins/openapi/package.json b/packages/plugins/openapi/package.json
index 6904eb17e..080de50ee 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.1",
+  "version": "1.0.0-beta.2",
   "description": "ZenStack plugin and runtime supporting OpenAPI",
   "main": "index.js",
   "repository": {
diff --git a/packages/plugins/react/README.md b/packages/plugins/react/README.md
index e651fe280..ea63793af 100644
--- a/packages/plugins/react/README.md
+++ b/packages/plugins/react/README.md
@@ -1,5 +1,7 @@
 # ZenStack React plugin & runtime
 
+**This package is deprecated. Please use `@zenstackhq/swr` or `@zenstackhq/tanstack-query` packages instead.**
+
 This package contains ZenStack plugin and runtime for ReactJS.
 
 Visit [Homepage](https://zenstack.dev) for more details.
diff --git a/packages/plugins/react/package.json b/packages/plugins/react/package.json
index 3c1fd0375..40aeaeaee 100644
--- a/packages/plugins/react/package.json
+++ b/packages/plugins/react/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/react",
     "displayName": "ZenStack plugin and runtime for ReactJS",
-    "version": "1.0.0-beta.1",
+    "version": "1.0.0-beta.2",
     "description": "ZenStack plugin and runtime for ReactJS",
     "main": "index.js",
     "repository": {
diff --git a/packages/plugins/swr/package.json b/packages/plugins/swr/package.json
index 1f2ccb561..6f3beafb3 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.1",
+    "version": "1.0.0-beta.2",
     "description": "ZenStack plugin for generating SWR hooks",
     "main": "index.js",
     "repository": {
diff --git a/packages/plugins/swr/src/generator.ts b/packages/plugins/swr/src/generator.ts
index 3c237a38f..e7ba5e555 100644
--- a/packages/plugins/swr/src/generator.ts
+++ b/packages/plugins/swr/src/generator.ts
@@ -295,7 +295,7 @@ function generateQueryHook(
         .addBody()
         .addStatements([
             'const { endpoint } = useContext(RequestHandlerContext);',
-            `return request.get<${returnType}>(\`\${endpoint}/${modelRouteName}/findMany\`, args, options);`,
+            `return request.get<${returnType}>(\`\${endpoint}/${modelRouteName}/${operation}\`, args, options);`,
         ]);
 }
 
diff --git a/packages/plugins/tanstack-query/package.json b/packages/plugins/tanstack-query/package.json
index 51063c5ab..059c4e8b4 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.1",
+    "version": "1.0.0-beta.2",
     "description": "ZenStack plugin for generating tanstack-query hooks",
     "main": "index.js",
     "repository": {
diff --git a/packages/plugins/trpc/package.json b/packages/plugins/trpc/package.json
index ab14f0ce1..df5e11664 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.1",
+    "version": "1.0.0-beta.2",
     "description": "ZenStack plugin for tRPC",
     "main": "index.js",
     "repository": {
diff --git a/packages/runtime/package.json b/packages/runtime/package.json
index 807f40381..b9ced493e 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.1",
+    "version": "1.0.0-beta.2",
     "description": "Runtime of ZenStack for both client-side and server-side environments.",
     "repository": {
         "type": "git",
diff --git a/packages/runtime/src/enhancements/model-meta.ts b/packages/runtime/src/enhancements/model-meta.ts
index 40ab077b6..bb16d9e67 100644
--- a/packages/runtime/src/enhancements/model-meta.ts
+++ b/packages/runtime/src/enhancements/model-meta.ts
@@ -9,7 +9,7 @@ export function getDefaultModelMeta(): ModelMeta {
         // eslint-disable-next-line @typescript-eslint/no-var-requires
         return require('.zenstack/model-meta').default;
     } catch {
-        throw new Error('Model meta cannot be loaded');
+        throw new Error('Model meta cannot be loaded. Please make sure "zenstack generate" has been run.');
     }
 }
 
diff --git a/packages/runtime/src/enhancements/policy/index.ts b/packages/runtime/src/enhancements/policy/index.ts
index 90101f264..24578258f 100644
--- a/packages/runtime/src/enhancements/policy/index.ts
+++ b/packages/runtime/src/enhancements/policy/index.ts
@@ -69,6 +69,8 @@ function getDefaultPolicy(): PolicyDef {
         // eslint-disable-next-line @typescript-eslint/no-var-requires
         return require('.zenstack/policy').default;
     } catch {
-        throw new Error('Policy definition cannot be loaded from default location');
+        throw new Error(
+            'Policy definition cannot be loaded from default location. Please make sure "zenstack generate" has been run.'
+        );
     }
 }
diff --git a/packages/schema/package.json b/packages/schema/package.json
index f1e263dfe..fb66a6d44 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.1",
+    "version": "1.0.0-beta.2",
     "author": {
         "name": "ZenStack Team"
     },
diff --git a/packages/schema/src/utils/ast-utils.ts b/packages/schema/src/utils/ast-utils.ts
index 6be749eb6..a9d50cdd3 100644
--- a/packages/schema/src/utils/ast-utils.ts
+++ b/packages/schema/src/utils/ast-utils.ts
@@ -59,10 +59,12 @@ export function mergeBaseModel(model: Model) {
             const dataModel = decl as DataModel;
 
             dataModel.fields = dataModel.superTypes
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                 .flatMap((superType) => updateContainer(superType.ref!.fields, dataModel))
                 .concat(dataModel.fields);
 
             dataModel.attributes = dataModel.superTypes
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                 .flatMap((superType) => updateContainer(superType.ref!.attributes, dataModel))
                 .concat(dataModel.attributes);
         });
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 9b1cc3f98..f52ab5fe6 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/sdk",
-    "version": "1.0.0-beta.1",
+    "version": "1.0.0-beta.2",
     "description": "ZenStack plugin development SDK",
     "main": "index.js",
     "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index 80b108166..04a345ac9 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/server",
-    "version": "1.0.0-beta.1",
+    "version": "1.0.0-beta.2",
     "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 39034bed9..f63a6b014 100644
--- a/packages/testtools/package.json
+++ b/packages/testtools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zenstackhq/testtools",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.2",
   "description": "ZenStack Test Tools",
   "main": "index.js",
   "publishConfig": {
diff --git a/tests/integration/test-run/package-lock.json b/tests/integration/test-run/package-lock.json
index 9a88aa567..cc02e4786 100644
--- a/tests/integration/test-run/package-lock.json
+++ b/tests/integration/test-run/package-lock.json
@@ -126,7 +126,7 @@
         },
         "../../../packages/runtime/dist": {
             "name": "@zenstackhq/runtime",
-            "version": "1.0.0-beta.1",
+            "version": "1.0.0-beta.2",
             "license": "MIT",
             "dependencies": {
                 "@paralleldrive/cuid2": "^2.2.0",
@@ -159,7 +159,7 @@
         },
         "../../../packages/schema/dist": {
             "name": "zenstack",
-            "version": "1.0.0-beta.1",
+            "version": "1.0.0-beta.2",
             "hasInstallScript": true,
             "license": "MIT",
             "dependencies": {