diff --git a/packages/language/package.json b/packages/language/package.json
index b7d65e3fc..a222a6d95 100644
--- a/packages/language/package.json
+++ b/packages/language/package.json
@@ -19,11 +19,11 @@
     "author": "ZenStack Team",
     "license": "MIT",
     "devDependencies": {
-        "langium-cli": "1.2.0",
+        "langium-cli": "1.3.1",
         "plist2": "^1.1.3"
     },
     "dependencies": {
-       "langium": "1.2.0"
+       "langium": "1.3.1"
     },
     "contributes": {
         "languages": [
diff --git a/packages/language/src/generated/ast.ts b/packages/language/src/generated/ast.ts
index 7463fb9da..a95a748d9 100644
--- a/packages/language/src/generated/ast.ts
+++ b/packages/language/src/generated/ast.ts
@@ -1,10 +1,24 @@
 /******************************************************************************
- * This file was generated by langium-cli 1.2.0.
+ * This file was generated by langium-cli 1.3.1.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 
 /* eslint-disable */
-import { AstNode, AbstractAstReflection, Reference, ReferenceInfo, TypeMetaData } from 'langium';
+import type { AstNode, Reference, ReferenceInfo, TypeMetaData } from 'langium';
+import { AbstractAstReflection } from 'langium';
+
+export const ZModelTerminals = {
+    WS: /\s+/,
+    INTERNAL_ATTRIBUTE_NAME: /@@@([_a-zA-Z][\w_]*\.)*[_a-zA-Z][\w_]*/,
+    MODEL_ATTRIBUTE_NAME: /@@([_a-zA-Z][\w_]*\.)*[_a-zA-Z][\w_]*/,
+    FIELD_ATTRIBUTE_NAME: /@([_a-zA-Z][\w_]*\.)*[_a-zA-Z][\w_]*/,
+    ID: /[_a-zA-Z][\w_]*/,
+    STRING: /"(\\.|[^"\\])*"|'(\\.|[^'\\])*'/,
+    NUMBER: /[+-]?[0-9]+(\.[0-9]+)?/,
+    TRIPLE_SLASH_COMMENT: /\/\/\/[^\n\r]*/,
+    ML_COMMENT: /\/\*[\s\S]*?\*\//,
+    SL_COMMENT: /\/\/[^\n\r]*/,
+};
 
 export type AbstractDeclaration = Attribute | DataModel | DataSource | Enum | FunctionDecl | GeneratorDecl | Plugin;
 
@@ -64,10 +78,10 @@ export function isReferenceTarget(item: unknown): item is ReferenceTarget {
     return reflection.isInstance(item, ReferenceTarget);
 }
 
-export type RegularID = 'abstract' | 'attribute' | 'datasource' | 'enum' | 'import' | 'in' | 'model' | 'plugin' | 'sort' | 'view' | string;
+export type RegularID = 'abstract' | 'attribute' | 'datasource' | 'enum' | 'import' | 'in' | 'model' | 'plugin' | 'view' | string;
 
 export function isRegularID(item: unknown): item is RegularID {
-    return item === 'model' || item === 'enum' || item === 'attribute' || item === 'datasource' || item === 'plugin' || item === 'abstract' || item === 'in' || item === 'sort' || item === 'view' || item === 'import' || (typeof item === 'string' && (/[_a-zA-Z][\w_]*/.test(item)));
+    return item === 'model' || item === 'enum' || item === 'attribute' || item === 'datasource' || item === 'plugin' || item === 'abstract' || item === 'in' || item === 'view' || item === 'import' || (typeof item === 'string' && (/[_a-zA-Z][\w_]*/.test(item)));
 }
 
 export type TypeDeclaration = DataModel | Enum;
@@ -81,7 +95,6 @@ export function isTypeDeclaration(item: unknown): item is TypeDeclaration {
 export interface Argument extends AstNode {
     readonly $container: InvocationExpr;
     readonly $type: 'Argument';
-    name?: RegularID
     value: Expression
 }
 
@@ -92,7 +105,7 @@ export function isArgument(item: unknown): item is Argument {
 }
 
 export interface ArrayExpr extends AstNode {
-    readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | ConfigArrayExpr | ConfigField | ConfigInvocationArg | FieldInitializer | FunctionDecl | MemberAccessExpr | PluginField | UnaryExpr | UnsupportedFieldType;
+    readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | ConfigArrayExpr | ConfigField | ConfigInvocationArg | FieldInitializer | FunctionDecl | MemberAccessExpr | PluginField | ReferenceArg | UnaryExpr | UnsupportedFieldType;
     readonly $type: 'ArrayExpr';
     items: Array<Expression>
 }
@@ -163,7 +176,7 @@ export function isAttributeParamType(item: unknown): item is AttributeParamType
 }
 
 export interface BinaryExpr extends AstNode {
-    readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | ConfigArrayExpr | ConfigField | ConfigInvocationArg | FieldInitializer | FunctionDecl | MemberAccessExpr | PluginField | UnaryExpr | UnsupportedFieldType;
+    readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | ConfigArrayExpr | ConfigField | ConfigInvocationArg | FieldInitializer | FunctionDecl | MemberAccessExpr | PluginField | ReferenceArg | UnaryExpr | UnsupportedFieldType;
     readonly $type: 'BinaryExpr';
     left: Expression
     operator: '!' | '!=' | '&&' | '<' | '<=' | '==' | '>' | '>=' | '?' | '^' | 'in' | '||'
@@ -177,7 +190,7 @@ export function isBinaryExpr(item: unknown): item is BinaryExpr {
 }
 
 export interface BooleanLiteral extends AstNode {
-    readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | ConfigArrayExpr | ConfigField | ConfigInvocationArg | FieldInitializer | FunctionDecl | MemberAccessExpr | PluginField | UnaryExpr | UnsupportedFieldType;
+    readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | ConfigArrayExpr | ConfigField | ConfigInvocationArg | FieldInitializer | FunctionDecl | MemberAccessExpr | PluginField | ReferenceArg | UnaryExpr | UnsupportedFieldType;
     readonly $type: 'BooleanLiteral';
     value: Boolean
 }
@@ -189,7 +202,7 @@ export function isBooleanLiteral(item: unknown): item is BooleanLiteral {
 }
 
 export interface ConfigArrayExpr extends AstNode {
-    readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | ConfigArrayExpr | ConfigField | ConfigInvocationArg | FieldInitializer | FunctionDecl | MemberAccessExpr | PluginField | UnaryExpr | UnsupportedFieldType;
+    readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | ConfigArrayExpr | ConfigField | ConfigInvocationArg | FieldInitializer | FunctionDecl | MemberAccessExpr | PluginField | ReferenceArg | UnaryExpr | UnsupportedFieldType;
     readonly $type: 'ConfigArrayExpr';
     items: Array<ConfigInvocationExpr | LiteralExpr>
 }
@@ -440,7 +453,7 @@ export function isInternalAttribute(item: unknown): item is InternalAttribute {
 }
 
 export interface InvocationExpr extends AstNode {
-    readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | ConfigArrayExpr | ConfigField | ConfigInvocationArg | FieldInitializer | FunctionDecl | MemberAccessExpr | PluginField | UnaryExpr | UnsupportedFieldType;
+    readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | ConfigArrayExpr | ConfigField | ConfigInvocationArg | FieldInitializer | FunctionDecl | MemberAccessExpr | PluginField | ReferenceArg | UnaryExpr | UnsupportedFieldType;
     readonly $type: 'InvocationExpr';
     args: Array<Argument>
     function: Reference<FunctionDecl>
@@ -453,7 +466,7 @@ export function isInvocationExpr(item: unknown): item is InvocationExpr {
 }
 
 export interface MemberAccessExpr extends AstNode {
-    readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | ConfigArrayExpr | ConfigField | ConfigInvocationArg | FieldInitializer | FunctionDecl | MemberAccessExpr | PluginField | UnaryExpr | UnsupportedFieldType;
+    readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | ConfigArrayExpr | ConfigField | ConfigInvocationArg | FieldInitializer | FunctionDecl | MemberAccessExpr | PluginField | ReferenceArg | UnaryExpr | UnsupportedFieldType;
     readonly $type: 'MemberAccessExpr';
     member: Reference<DataModelField>
     operand: Expression
@@ -490,7 +503,7 @@ export function isModelImport(item: unknown): item is ModelImport {
 }
 
 export interface NullExpr extends AstNode {
-    readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | ConfigArrayExpr | ConfigField | ConfigInvocationArg | FieldInitializer | FunctionDecl | MemberAccessExpr | PluginField | UnaryExpr | UnsupportedFieldType;
+    readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | ConfigArrayExpr | ConfigField | ConfigInvocationArg | FieldInitializer | FunctionDecl | MemberAccessExpr | PluginField | ReferenceArg | UnaryExpr | UnsupportedFieldType;
     readonly $type: 'NullExpr';
     value: 'null'
 }
@@ -502,7 +515,7 @@ export function isNullExpr(item: unknown): item is NullExpr {
 }
 
 export interface NumberLiteral extends AstNode {
-    readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | ConfigArrayExpr | ConfigField | ConfigInvocationArg | FieldInitializer | FunctionDecl | MemberAccessExpr | PluginField | UnaryExpr | UnsupportedFieldType;
+    readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | ConfigArrayExpr | ConfigField | ConfigInvocationArg | FieldInitializer | FunctionDecl | MemberAccessExpr | PluginField | ReferenceArg | UnaryExpr | UnsupportedFieldType;
     readonly $type: 'NumberLiteral';
     value: string
 }
@@ -514,7 +527,7 @@ export function isNumberLiteral(item: unknown): item is NumberLiteral {
 }
 
 export interface ObjectExpr extends AstNode {
-    readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | ConfigArrayExpr | ConfigField | ConfigInvocationArg | FieldInitializer | FunctionDecl | MemberAccessExpr | PluginField | UnaryExpr | UnsupportedFieldType;
+    readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | ConfigArrayExpr | ConfigField | ConfigInvocationArg | FieldInitializer | FunctionDecl | MemberAccessExpr | PluginField | ReferenceArg | UnaryExpr | UnsupportedFieldType;
     readonly $type: 'ObjectExpr';
     fields: Array<FieldInitializer>
 }
@@ -554,8 +567,8 @@ export function isPluginField(item: unknown): item is PluginField {
 export interface ReferenceArg extends AstNode {
     readonly $container: ReferenceExpr;
     readonly $type: 'ReferenceArg';
-    name: 'sort'
-    value: 'Asc' | 'Desc'
+    name: string
+    value: Expression
 }
 
 export const ReferenceArg = 'ReferenceArg';
@@ -565,7 +578,7 @@ export function isReferenceArg(item: unknown): item is ReferenceArg {
 }
 
 export interface ReferenceExpr extends AstNode {
-    readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | ConfigArrayExpr | ConfigField | ConfigInvocationArg | FieldInitializer | FunctionDecl | MemberAccessExpr | PluginField | UnaryExpr | UnsupportedFieldType;
+    readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | ConfigArrayExpr | ConfigField | ConfigInvocationArg | FieldInitializer | FunctionDecl | MemberAccessExpr | PluginField | ReferenceArg | UnaryExpr | UnsupportedFieldType;
     readonly $type: 'ReferenceExpr';
     args: Array<ReferenceArg>
     target: Reference<ReferenceTarget>
@@ -578,7 +591,7 @@ export function isReferenceExpr(item: unknown): item is ReferenceExpr {
 }
 
 export interface StringLiteral extends AstNode {
-    readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | ConfigArrayExpr | ConfigField | ConfigInvocationArg | FieldInitializer | FunctionDecl | MemberAccessExpr | PluginField | UnaryExpr | UnsupportedFieldType;
+    readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | ConfigArrayExpr | ConfigField | ConfigInvocationArg | FieldInitializer | FunctionDecl | MemberAccessExpr | PluginField | ReferenceArg | UnaryExpr | UnsupportedFieldType;
     readonly $type: 'StringLiteral';
     value: string
 }
@@ -590,7 +603,7 @@ export function isStringLiteral(item: unknown): item is StringLiteral {
 }
 
 export interface ThisExpr extends AstNode {
-    readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | ConfigArrayExpr | ConfigField | ConfigInvocationArg | FieldInitializer | FunctionDecl | MemberAccessExpr | PluginField | UnaryExpr | UnsupportedFieldType;
+    readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | ConfigArrayExpr | ConfigField | ConfigInvocationArg | FieldInitializer | FunctionDecl | MemberAccessExpr | PluginField | ReferenceArg | UnaryExpr | UnsupportedFieldType;
     readonly $type: 'ThisExpr';
     value: 'this'
 }
@@ -602,7 +615,7 @@ export function isThisExpr(item: unknown): item is ThisExpr {
 }
 
 export interface UnaryExpr extends AstNode {
-    readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | ConfigArrayExpr | ConfigField | ConfigInvocationArg | FieldInitializer | FunctionDecl | MemberAccessExpr | PluginField | UnaryExpr | UnsupportedFieldType;
+    readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | ConfigArrayExpr | ConfigField | ConfigInvocationArg | FieldInitializer | FunctionDecl | MemberAccessExpr | PluginField | ReferenceArg | UnaryExpr | UnsupportedFieldType;
     readonly $type: 'UnaryExpr';
     operand: Expression
     operator: '!'
diff --git a/packages/language/src/generated/grammar.ts b/packages/language/src/generated/grammar.ts
index 5dbe02014..45aa3ff97 100644
--- a/packages/language/src/generated/grammar.ts
+++ b/packages/language/src/generated/grammar.ts
@@ -1,9 +1,10 @@
 /******************************************************************************
- * This file was generated by langium-cli 1.2.0.
+ * This file was generated by langium-cli 1.3.1.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 
-import { loadGrammarFromJson, Grammar } from 'langium';
+import type { Grammar } from 'langium';
+import { loadGrammarFromJson } from 'langium';
 
 let loadedZModelGrammar: Grammar | undefined;
 export const ZModelGrammar = (): Grammar => loadedZModelGrammar ?? (loadedZModelGrammar = loadGrammarFromJson(`{
@@ -1052,8 +1053,11 @@ export const ZModelGrammar = (): Grammar => loadedZModelGrammar ?? (loadedZModel
             "feature": "name",
             "operator": "=",
             "terminal": {
-              "$type": "Keyword",
-              "value": "sort"
+              "$type": "RuleCall",
+              "rule": {
+                "$ref": "#/rules@62"
+              },
+              "arguments": []
             }
           },
           {
@@ -1065,17 +1069,11 @@ export const ZModelGrammar = (): Grammar => loadedZModelGrammar ?? (loadedZModel
             "feature": "value",
             "operator": "=",
             "terminal": {
-              "$type": "Alternatives",
-              "elements": [
-                {
-                  "$type": "Keyword",
-                  "value": "Asc"
-                },
-                {
-                  "$type": "Keyword",
-                  "value": "Desc"
-                }
-              ]
+              "$type": "RuleCall",
+              "rule": {
+                "$ref": "#/rules@8"
+              },
+              "arguments": []
             }
           }
         ]
@@ -1865,43 +1863,16 @@ export const ZModelGrammar = (): Grammar => loadedZModelGrammar ?? (loadedZModel
       "$type": "ParserRule",
       "name": "Argument",
       "definition": {
-        "$type": "Group",
-        "elements": [
-          {
-            "$type": "Group",
-            "elements": [
-              {
-                "$type": "Assignment",
-                "feature": "name",
-                "operator": "=",
-                "terminal": {
-                  "$type": "RuleCall",
-                  "rule": {
-                    "$ref": "#/rules@46"
-                  },
-                  "arguments": []
-                }
-              },
-              {
-                "$type": "Keyword",
-                "value": ":"
-              }
-            ],
-            "cardinality": "?"
+        "$type": "Assignment",
+        "feature": "value",
+        "operator": "=",
+        "terminal": {
+          "$type": "RuleCall",
+          "rule": {
+            "$ref": "#/rules@8"
           },
-          {
-            "$type": "Assignment",
-            "feature": "value",
-            "operator": "=",
-            "terminal": {
-              "$type": "RuleCall",
-              "rule": {
-                "$ref": "#/rules@8"
-              },
-              "arguments": []
-            }
-          }
-        ]
+          "arguments": []
+        }
       },
       "definesHiddenTokens": false,
       "entry": false,
@@ -2723,10 +2694,6 @@ export const ZModelGrammar = (): Grammar => loadedZModelGrammar ?? (loadedZModel
             "$type": "Keyword",
             "value": "in"
           },
-          {
-            "$type": "Keyword",
-            "value": "sort"
-          },
           {
             "$type": "Keyword",
             "value": "view"
@@ -3452,7 +3419,7 @@ export const ZModelGrammar = (): Grammar => loadedZModelGrammar ?? (loadedZModel
       "name": "WS",
       "definition": {
         "$type": "RegexToken",
-        "regex": "\\\\s+"
+        "regex": "/\\\\s+/"
       },
       "fragment": false
     },
@@ -3461,7 +3428,7 @@ export const ZModelGrammar = (): Grammar => loadedZModelGrammar ?? (loadedZModel
       "name": "INTERNAL_ATTRIBUTE_NAME",
       "definition": {
         "$type": "RegexToken",
-        "regex": "@@@([_a-zA-Z][\\\\w_]*\\\\.)*[_a-zA-Z][\\\\w_]*"
+        "regex": "/@@@([_a-zA-Z][\\\\w_]*\\\\.)*[_a-zA-Z][\\\\w_]*/"
       },
       "fragment": false,
       "hidden": false
@@ -3471,7 +3438,7 @@ export const ZModelGrammar = (): Grammar => loadedZModelGrammar ?? (loadedZModel
       "name": "MODEL_ATTRIBUTE_NAME",
       "definition": {
         "$type": "RegexToken",
-        "regex": "@@([_a-zA-Z][\\\\w_]*\\\\.)*[_a-zA-Z][\\\\w_]*"
+        "regex": "/@@([_a-zA-Z][\\\\w_]*\\\\.)*[_a-zA-Z][\\\\w_]*/"
       },
       "fragment": false,
       "hidden": false
@@ -3481,7 +3448,7 @@ export const ZModelGrammar = (): Grammar => loadedZModelGrammar ?? (loadedZModel
       "name": "FIELD_ATTRIBUTE_NAME",
       "definition": {
         "$type": "RegexToken",
-        "regex": "@([_a-zA-Z][\\\\w_]*\\\\.)*[_a-zA-Z][\\\\w_]*"
+        "regex": "/@([_a-zA-Z][\\\\w_]*\\\\.)*[_a-zA-Z][\\\\w_]*/"
       },
       "fragment": false,
       "hidden": false
@@ -3491,7 +3458,7 @@ export const ZModelGrammar = (): Grammar => loadedZModelGrammar ?? (loadedZModel
       "name": "ID",
       "definition": {
         "$type": "RegexToken",
-        "regex": "[_a-zA-Z][\\\\w_]*"
+        "regex": "/[_a-zA-Z][\\\\w_]*/"
       },
       "fragment": false,
       "hidden": false
@@ -3501,7 +3468,7 @@ export const ZModelGrammar = (): Grammar => loadedZModelGrammar ?? (loadedZModel
       "name": "STRING",
       "definition": {
         "$type": "RegexToken",
-        "regex": "\\"(\\\\\\\\.|[^\\"\\\\\\\\])*\\"|'(\\\\\\\\.|[^'\\\\\\\\])*'"
+        "regex": "/\\"(\\\\\\\\.|[^\\"\\\\\\\\])*\\"|'(\\\\\\\\.|[^'\\\\\\\\])*'/"
       },
       "fragment": false,
       "hidden": false
@@ -3511,7 +3478,7 @@ export const ZModelGrammar = (): Grammar => loadedZModelGrammar ?? (loadedZModel
       "name": "NUMBER",
       "definition": {
         "$type": "RegexToken",
-        "regex": "[+-]?[0-9]+(\\\\.[0-9]+)?"
+        "regex": "/[+-]?[0-9]+(\\\\.[0-9]+)?/"
       },
       "fragment": false,
       "hidden": false
@@ -3521,7 +3488,7 @@ export const ZModelGrammar = (): Grammar => loadedZModelGrammar ?? (loadedZModel
       "name": "TRIPLE_SLASH_COMMENT",
       "definition": {
         "$type": "RegexToken",
-        "regex": "\\\\/\\\\/\\\\/[^\\\\n\\\\r]*"
+        "regex": "/\\\\/\\\\/\\\\/[^\\\\n\\\\r]*/"
       },
       "fragment": false,
       "hidden": false
@@ -3532,7 +3499,7 @@ export const ZModelGrammar = (): Grammar => loadedZModelGrammar ?? (loadedZModel
       "name": "ML_COMMENT",
       "definition": {
         "$type": "RegexToken",
-        "regex": "\\\\/\\\\*[\\\\s\\\\S]*?\\\\*\\\\/"
+        "regex": "/\\\\/\\\\*[\\\\s\\\\S]*?\\\\*\\\\//"
       },
       "fragment": false
     },
@@ -3542,7 +3509,7 @@ export const ZModelGrammar = (): Grammar => loadedZModelGrammar ?? (loadedZModel
       "name": "SL_COMMENT",
       "definition": {
         "$type": "RegexToken",
-        "regex": "\\\\/\\\\/[^\\\\n\\\\r]*"
+        "regex": "/\\\\/\\\\/[^\\\\n\\\\r]*/"
       },
       "fragment": false
     }
diff --git a/packages/language/src/generated/module.ts b/packages/language/src/generated/module.ts
index ac0995108..b96dd1dee 100644
--- a/packages/language/src/generated/module.ts
+++ b/packages/language/src/generated/module.ts
@@ -1,17 +1,17 @@
 /******************************************************************************
- * This file was generated by langium-cli 1.2.0.
+ * This file was generated by langium-cli 1.3.1.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 
-import { LangiumGeneratedServices, LangiumGeneratedSharedServices, LangiumSharedServices, LangiumServices, LanguageMetaData, Module } from 'langium';
+import type { LangiumGeneratedServices, LangiumGeneratedSharedServices, LangiumSharedServices, LangiumServices, LanguageMetaData, Module } from 'langium';
 import { ZModelAstReflection } from './ast';
 import { ZModelGrammar } from './grammar';
 
-export const ZModelLanguageMetaData: LanguageMetaData = {
+export const ZModelLanguageMetaData = {
     languageId: 'zmodel',
     fileExtensions: ['.zmodel'],
     caseInsensitive: false
-};
+} as const satisfies LanguageMetaData;
 
 export const ZModelGeneratedSharedModule: Module<LangiumSharedServices, LangiumGeneratedSharedServices> = {
     AstReflection: () => new ZModelAstReflection()
diff --git a/packages/language/src/zmodel.langium b/packages/language/src/zmodel.langium
index da445c792..8fcc72c34 100644
--- a/packages/language/src/zmodel.langium
+++ b/packages/language/src/zmodel.langium
@@ -80,7 +80,7 @@ fragment ReferenceArgList:
     args+=ReferenceArg (',' args+=ReferenceArg)*;
 
 ReferenceArg:
-    name=('sort') ':' value=('Asc' | 'Desc');
+    name=ID ':' value=Expression;
 
 
 ObjectExpr:
@@ -172,7 +172,7 @@ fragment ArgumentList:
     args+=Argument (',' args+=Argument)*;
 
 Argument:
-    (name=RegularID ':')? value=Expression;
+    value=Expression;
 
 // model
 DataModel:
@@ -224,7 +224,7 @@ FunctionParamType:
 // https://github.com/langium/langium/discussions/1012
 RegularID returns string:
     // include keywords that we'd like to work as ID in most places
-    ID | 'model' | 'enum' | 'attribute' | 'datasource' | 'plugin' | 'abstract' | 'in' | 'sort' | 'view' | 'import';
+    ID | 'model' | 'enum' | 'attribute' | 'datasource' | 'plugin' | 'abstract' | 'in' | 'view' | 'import';
 
 // attribute
 Attribute:
diff --git a/packages/language/syntaxes/zmodel.tmLanguage b/packages/language/syntaxes/zmodel.tmLanguage
index cf70fb761..6102b919d 100644
--- a/packages/language/syntaxes/zmodel.tmLanguage
+++ b/packages/language/syntaxes/zmodel.tmLanguage
@@ -20,7 +20,7 @@
         <key>name</key>
         <string>keyword.control.zmodel</string>
         <key>match</key>
-        <string>\b(Any|Asc|BigInt|Boolean|Bytes|ContextType|DateTime|Decimal|Desc|FieldReference|Float|Int|Json|Null|Object|String|TransitiveFieldReference|Unsupported|abstract|attribute|datasource|enum|extends|false|function|generator|import|in|model|null|plugin|sort|this|true|view)\b</string>
+        <string>\b(Any|BigInt|Boolean|Bytes|ContextType|DateTime|Decimal|FieldReference|Float|Int|Json|Null|Object|String|TransitiveFieldReference|Unsupported|abstract|attribute|datasource|enum|extends|false|function|generator|import|in|model|null|plugin|this|true|view)\b</string>
       </dict>
       <dict>
         <key>name</key>
diff --git a/packages/language/syntaxes/zmodel.tmLanguage.json b/packages/language/syntaxes/zmodel.tmLanguage.json
index 00c737c97..aad6a38c7 100644
--- a/packages/language/syntaxes/zmodel.tmLanguage.json
+++ b/packages/language/syntaxes/zmodel.tmLanguage.json
@@ -10,7 +10,7 @@
     },
     {
       "name": "keyword.control.zmodel",
-      "match": "\\b(Any|Asc|BigInt|Boolean|Bytes|ContextType|DateTime|Decimal|Desc|FieldReference|Float|Int|Json|Null|Object|String|TransitiveFieldReference|Unsupported|abstract|attribute|datasource|enum|extends|false|function|generator|import|in|model|null|plugin|sort|this|true|view)\\b"
+      "match": "\\b(Any|BigInt|Boolean|Bytes|ContextType|DateTime|Decimal|FieldReference|Float|Int|Json|Null|Object|String|TransitiveFieldReference|Unsupported|abstract|attribute|datasource|enum|extends|false|function|generator|import|in|model|null|plugin|this|true|view)\\b"
     },
     {
       "name": "string.quoted.double.zmodel",
diff --git a/packages/plugins/tanstack-query/src/generator.ts b/packages/plugins/tanstack-query/src/generator.ts
index b8c601dc4..58836091a 100644
--- a/packages/plugins/tanstack-query/src/generator.ts
+++ b/packages/plugins/tanstack-query/src/generator.ts
@@ -73,68 +73,88 @@ function generateQueryHook(
     overrideReturnType?: string,
     overrideInputType?: string,
     overrideTypeParameters?: string[],
-    infinite = false,
-    optimisticUpdate = false
+    supportInfinite = false,
+    supportOptimistic = false
 ) {
-    const capOperation = upperCaseFirst(operation);
-
-    const argsType = overrideInputType ?? `Prisma.${model}${capOperation}Args`;
-    const inputType = `Prisma.SelectSubset<TArgs, ${argsType}>`;
-
-    let defaultReturnType = `Prisma.${model}GetPayload<TArgs>`;
-    if (optimisticUpdate) {
-        defaultReturnType += '& { $optimistic?: boolean }';
+    const generateModes: ('' | 'Infinite' | 'Suspense' | 'SuspenseInfinite')[] = [''];
+    if (supportInfinite) {
+        generateModes.push('Infinite');
     }
-    if (returnArray) {
-        defaultReturnType = `Array<${defaultReturnType}>`;
+
+    if (target === 'react' && version === 'v5') {
+        // react-query v5 supports suspense query
+        generateModes.push('Suspense');
+        if (supportInfinite) {
+            generateModes.push('SuspenseInfinite');
+        }
     }
 
-    const returnType = overrideReturnType ?? defaultReturnType;
-    const optionsType = makeQueryOptions(target, 'TQueryFnData', 'TData', infinite, version);
+    for (const generateMode of generateModes) {
+        const capOperation = upperCaseFirst(operation);
 
-    const func = sf.addFunction({
-        name: `use${infinite ? 'Infinite' : ''}${capOperation}${model}`,
-        typeParameters: overrideTypeParameters ?? [
-            `TArgs extends ${argsType}`,
-            `TQueryFnData = ${returnType} `,
-            'TData = TQueryFnData',
-            'TError = DefaultError',
-        ],
-        parameters: [
-            {
-                name: optionalInput ? 'args?' : 'args',
-                type: inputType,
-            },
-            {
-                name: 'options?',
-                type: optionsType,
-            },
-            ...(optimisticUpdate
-                ? [
-                      {
-                          name: 'optimisticUpdate',
-                          type: 'boolean',
-                          initializer: 'true',
-                      },
-                  ]
-                : []),
-        ],
-        isExported: true,
-    });
+        const argsType = overrideInputType ?? `Prisma.${model}${capOperation}Args`;
+        const inputType = `Prisma.SelectSubset<TArgs, ${argsType}>`;
 
-    if (version === 'v5' && infinite && ['react', 'svelte'].includes(target)) {
-        // initialPageParam and getNextPageParam options are required in v5
-        func.addStatements([`options = options ?? { initialPageParam: undefined, getNextPageParam: () => null };`]);
-    }
+        const infinite = generateMode.includes('Infinite');
+        const suspense = generateMode.includes('Suspense');
+        const optimistic =
+            supportOptimistic &&
+            // infinite queries are not subject to optimistic updates
+            !infinite;
+
+        let defaultReturnType = `Prisma.${model}GetPayload<TArgs>`;
+        if (optimistic) {
+            defaultReturnType += '& { $optimistic?: boolean }';
+        }
+        if (returnArray) {
+            defaultReturnType = `Array<${defaultReturnType}>`;
+        }
+
+        const returnType = overrideReturnType ?? defaultReturnType;
+        const optionsType = makeQueryOptions(target, 'TQueryFnData', 'TData', infinite, suspense, version);
+
+        const func = sf.addFunction({
+            name: `use${generateMode}${capOperation}${model}`,
+            typeParameters: overrideTypeParameters ?? [
+                `TArgs extends ${argsType}`,
+                `TQueryFnData = ${returnType} `,
+                'TData = TQueryFnData',
+                'TError = DefaultError',
+            ],
+            parameters: [
+                {
+                    name: optionalInput ? 'args?' : 'args',
+                    type: inputType,
+                },
+                {
+                    name: 'options?',
+                    type: optionsType,
+                },
+                ...(optimistic
+                    ? [
+                          {
+                              name: 'optimisticUpdate',
+                              type: 'boolean',
+                              initializer: 'true',
+                          },
+                      ]
+                    : []),
+            ],
+            isExported: true,
+        });
+
+        if (version === 'v5' && infinite && ['react', 'svelte'].includes(target)) {
+            // initialPageParam and getNextPageParam options are required in v5
+            func.addStatements([`options = options ?? { initialPageParam: undefined, getNextPageParam: () => null };`]);
+        }
 
-    func.addStatements([
-        makeGetContext(target),
-        `return ${
-            infinite ? 'useInfiniteModelQuery' : 'useModelQuery'
-        }<TQueryFnData, TData, TError>('${model}', \`\${endpoint}/${lowerCaseFirst(
-            model
-        )}/${operation}\`, args, options, fetch${optimisticUpdate ? ', optimisticUpdate' : ''});`,
-    ]);
+        func.addStatements([
+            makeGetContext(target),
+            `return use${generateMode}ModelQuery<TQueryFnData, TData, TError>('${model}', \`\${endpoint}/${lowerCaseFirst(
+                model
+            )}/${operation}\`, args, options, fetch${optimistic ? ', optimisticUpdate' : ''});`,
+        ]);
+    }
 }
 
 function generateMutationHook(
@@ -308,23 +328,8 @@ function generateModelHooks(
             undefined,
             undefined,
             undefined,
-            false,
-            true
-        );
-        // infinite findMany
-        generateQueryHook(
-            target,
-            version,
-            sf,
-            model.name,
-            'findMany',
-            true,
             true,
-            undefined,
-            undefined,
-            undefined,
-            true,
-            false
+            true
         );
     }
 
@@ -560,19 +565,29 @@ function makeBaseImports(target: TargetFramework, version: TanStackVersion) {
         `type DefaultError = Error;`,
     ];
     switch (target) {
-        case 'react':
+        case 'react': {
+            const suspense =
+                version === 'v5'
+                    ? [
+                          `import { useSuspenseModelQuery, useSuspenseInfiniteModelQuery } from '${runtimeImportBase}/${target}';`,
+                          `import type { UseSuspenseQueryOptions, UseSuspenseInfiniteQueryOptions } from '@tanstack/react-query';`,
+                      ]
+                    : [];
             return [
                 `import type { UseMutationOptions, UseQueryOptions, UseInfiniteQueryOptions, InfiniteData } from '@tanstack/react-query';`,
                 `import { getHooksContext } from '${runtimeImportBase}/${target}';`,
                 ...shared,
+                ...suspense,
             ];
-        case 'vue':
+        }
+        case 'vue': {
             return [
                 `import type { UseMutationOptions, UseQueryOptions, UseInfiniteQueryOptions, InfiniteData } from '@tanstack/vue-query';`,
                 `import { getHooksContext } from '${runtimeImportBase}/${target}';`,
                 ...shared,
             ];
-        case 'svelte':
+        }
+        case 'svelte': {
             return [
                 `import { derived } from 'svelte/store';`,
                 `import type { MutationOptions, CreateQueryOptions, CreateInfiniteQueryOptions } from '@tanstack/svelte-query';`,
@@ -582,6 +597,7 @@ function makeBaseImports(target: TargetFramework, version: TanStackVersion) {
                 `import { getHooksContext } from '${runtimeImportBase}/${target}';`,
                 ...shared,
             ];
+        }
         default:
             throw new PluginError(name, `Unsupported target: ${target}`);
     }
@@ -592,6 +608,7 @@ function makeQueryOptions(
     returnType: string,
     dataType: string,
     infinite: boolean,
+    suspense: boolean,
     version: TanStackVersion
 ) {
     switch (target) {
@@ -599,8 +616,10 @@ function makeQueryOptions(
             return infinite
                 ? version === 'v4'
                     ? `Omit<UseInfiniteQueryOptions<${returnType}, TError, ${dataType}>, 'queryKey'>`
-                    : `Omit<UseInfiniteQueryOptions<${returnType}, TError, InfiniteData<${dataType}>>, 'queryKey'>`
-                : `Omit<UseQueryOptions<${returnType}, TError, ${dataType}>, 'queryKey'>`;
+                    : `Omit<Use${
+                          suspense ? 'Suspense' : ''
+                      }InfiniteQueryOptions<${returnType}, TError, InfiniteData<${dataType}>>, 'queryKey'>`
+                : `Omit<Use${suspense ? 'Suspense' : ''}QueryOptions<${returnType}, TError, ${dataType}>, 'queryKey'>`;
         case 'vue':
             return `Omit<Use${infinite ? 'Infinite' : ''}QueryOptions<${returnType}, TError, ${dataType}>, 'queryKey'>`;
         case 'svelte':
diff --git a/packages/plugins/tanstack-query/src/runtime-v5/react.ts b/packages/plugins/tanstack-query/src/runtime-v5/react.ts
index 4871e8229..375cb2676 100644
--- a/packages/plugins/tanstack-query/src/runtime-v5/react.ts
+++ b/packages/plugins/tanstack-query/src/runtime-v5/react.ts
@@ -4,10 +4,14 @@ import {
     useMutation,
     useQuery,
     useQueryClient,
+    useSuspenseInfiniteQuery,
+    useSuspenseQuery,
     type InfiniteData,
     type UseInfiniteQueryOptions,
     type UseMutationOptions,
     type UseQueryOptions,
+    UseSuspenseInfiniteQueryOptions,
+    UseSuspenseQueryOptions,
 } from '@tanstack/react-query-v5';
 import type { ModelMeta } from '@zenstackhq/runtime/cross';
 import { createContext, useContext } from 'react';
@@ -71,6 +75,33 @@ export function useModelQuery<TQueryFnData, TData, TError>(
     });
 }
 
+/**
+ * Creates a react-query suspense query.
+ *
+ * @param model The name of the model under query.
+ * @param url The request URL.
+ * @param args The request args object, URL-encoded and appended as "?q=" parameter
+ * @param options The react-query options object
+ * @param fetch The fetch function to use for sending the HTTP request
+ * @param optimisticUpdate Whether to enable automatic optimistic update
+ * @returns useSuspenseQuery hook
+ */
+export function useSuspenseModelQuery<TQueryFnData, TData, TError>(
+    model: string,
+    url: string,
+    args?: unknown,
+    options?: Omit<UseSuspenseQueryOptions<TQueryFnData, TError, TData>, 'queryKey'>,
+    fetch?: FetchFn,
+    optimisticUpdate = false
+) {
+    const reqUrl = makeUrl(url, args);
+    return useSuspenseQuery({
+        queryKey: getQueryKey(model, url, args, false, optimisticUpdate),
+        queryFn: () => fetcher<TQueryFnData, false>(reqUrl, undefined, fetch, false),
+        ...options,
+    });
+}
+
 /**
  * Creates a react-query infinite query.
  *
@@ -97,6 +128,32 @@ export function useInfiniteModelQuery<TQueryFnData, TData, TError>(
     });
 }
 
+/**
+ * Creates a react-query infinite suspense query.
+ *
+ * @param model The name of the model under query.
+ * @param url The request URL.
+ * @param args The initial request args object, URL-encoded and appended as "?q=" parameter
+ * @param options The react-query infinite query options object
+ * @param fetch The fetch function to use for sending the HTTP request
+ * @returns useSuspenseInfiniteQuery hook
+ */
+export function useSuspenseInfiniteModelQuery<TQueryFnData, TData, TError>(
+    model: string,
+    url: string,
+    args: unknown,
+    options: Omit<UseSuspenseInfiniteQueryOptions<TQueryFnData, TError, InfiniteData<TData>>, 'queryKey'>,
+    fetch?: FetchFn
+) {
+    return useSuspenseInfiniteQuery({
+        queryKey: getQueryKey(model, url, args, true),
+        queryFn: ({ pageParam }) => {
+            return fetcher<TQueryFnData, false>(makeUrl(url, pageParam ?? args), undefined, fetch, false);
+        },
+        ...options,
+    });
+}
+
 /**
  * Creates a react-query mutation
  *
diff --git a/packages/runtime/src/enhancements/omit.ts b/packages/runtime/src/enhancements/omit.ts
index e05a8a769..e51f9cb47 100644
--- a/packages/runtime/src/enhancements/omit.ts
+++ b/packages/runtime/src/enhancements/omit.ts
@@ -42,11 +42,18 @@ class OmitHandler extends DefaultPrismaProxyHandler {
                 continue;
             }
 
-            if (fieldInfo.attributes?.find((attr) => attr.name === '@omit')) {
+            const shouldOmit = fieldInfo.attributes?.find((attr) => attr.name === '@omit');
+            if (shouldOmit) {
                 delete entityData[field];
-            } else if (fieldInfo.isDataModel) {
-                // recurse
-                await this.doPostProcess(entityData[field], fieldInfo.type);
+            }
+
+            if (fieldInfo.isDataModel) {
+                const items =
+                    fieldInfo.isArray && Array.isArray(entityData[field]) ? entityData[field] : [entityData[field]];
+                for (const item of items) {
+                    // recurse
+                    await this.doPostProcess(item, fieldInfo.type);
+                }
             }
         }
     }
diff --git a/packages/runtime/src/enhancements/policy/handler.ts b/packages/runtime/src/enhancements/policy/handler.ts
index 1bc60a647..6ae173fcd 100644
--- a/packages/runtime/src/enhancements/policy/handler.ts
+++ b/packages/runtime/src/enhancements/policy/handler.ts
@@ -263,7 +263,7 @@ export class PolicyProxyHandler<DbClient extends DbClientContract> implements Pr
                 // there's no nested write and we've passed input check, proceed with the create directly
 
                 // validate zod schema if any
-                this.validateCreateInputSchema(this.model, args.data);
+                args.data = this.validateCreateInputSchema(this.model, args.data);
 
                 // make a create args only containing data and ID selection
                 const createArgs: any = { data: args.data, select: this.policyUtils.makeIdSelection(this.model) };
@@ -319,12 +319,20 @@ export class PolicyProxyHandler<DbClient extends DbClientContract> implements Pr
         // visit the create payload
         const visitor = new NestedWriteVisitor(this.modelMeta, {
             create: async (model, args, context) => {
-                this.validateCreateInputSchema(model, args);
+                const validateResult = this.validateCreateInputSchema(model, args);
+                if (validateResult !== args) {
+                    this.policyUtils.replace(args, validateResult);
+                }
                 pushIdFields(model, context);
             },
 
             createMany: async (model, args, context) => {
-                enumerate(args.data).forEach((item) => this.validateCreateInputSchema(model, item));
+                enumerate(args.data).forEach((item) => {
+                    const r = this.validateCreateInputSchema(model, item);
+                    if (r !== item) {
+                        this.policyUtils.replace(item, r);
+                    }
+                });
                 pushIdFields(model, context);
             },
 
@@ -333,7 +341,9 @@ export class PolicyProxyHandler<DbClient extends DbClientContract> implements Pr
                     throw this.policyUtils.validationError(`'where' field is required for connectOrCreate`);
                 }
 
-                this.validateCreateInputSchema(model, args.create);
+                if (args.create) {
+                    args.create = this.validateCreateInputSchema(model, args.create);
+                }
 
                 const existing = await this.policyUtils.checkExistence(db, model, args.where);
                 if (existing) {
@@ -482,6 +492,9 @@ export class PolicyProxyHandler<DbClient extends DbClientContract> implements Pr
                     parseResult.error
                 );
             }
+            return parseResult.data;
+        } else {
+            return data;
         }
     }
 
@@ -513,7 +526,10 @@ export class PolicyProxyHandler<DbClient extends DbClientContract> implements Pr
                     CrudFailureReason.ACCESS_POLICY_VIOLATION
                 );
             } else if (inputCheck === true) {
-                this.validateCreateInputSchema(this.model, item);
+                const r = this.validateCreateInputSchema(this.model, item);
+                if (r !== item) {
+                    this.policyUtils.replace(item, r);
+                }
             } else if (inputCheck === undefined) {
                 // static policy check is not possible, need to do post-create check
                 needPostCreateCheck = true;
diff --git a/packages/runtime/src/enhancements/policy/policy-utils.ts b/packages/runtime/src/enhancements/policy/policy-utils.ts
index 50ef3a3bc..1f4629359 100644
--- a/packages/runtime/src/enhancements/policy/policy-utils.ts
+++ b/packages/runtime/src/enhancements/policy/policy-utils.ts
@@ -1147,6 +1147,27 @@ export class PolicyUtil extends QueryUtils {
         return value ? deepcopy(value) : {};
     }
 
+    /**
+     * Replace content of `target` object with `withObject` in-place.
+     */
+    replace(target: any, withObject: any) {
+        if (!target || typeof target !== 'object' || !withObject || typeof withObject !== 'object') {
+            return;
+        }
+
+        // remove missing keys
+        for (const key of Object.keys(target)) {
+            if (!(key in withObject)) {
+                delete target[key];
+            }
+        }
+
+        // overwrite keys
+        for (const [key, value] of Object.entries(withObject)) {
+            target[key] = value;
+        }
+    }
+
     /**
      * Picks properties from an object.
      */
diff --git a/packages/schema/package.json b/packages/schema/package.json
index 613cafb77..09693e0e7 100644
--- a/packages/schema/package.json
+++ b/packages/schema/package.json
@@ -87,7 +87,7 @@
         "colors": "1.4.0",
         "commander": "^8.3.0",
         "get-latest-version": "^5.0.1",
-        "langium": "1.2.0",
+        "langium": "1.3.1",
         "lower-case-first": "^2.0.2",
         "mixpanel": "^0.17.0",
         "ora": "^5.4.1",
diff --git a/packages/schema/src/cli/index.ts b/packages/schema/src/cli/index.ts
index f4fee92b7..a3ea38238 100644
--- a/packages/schema/src/cli/index.ts
+++ b/packages/schema/src/cli/index.ts
@@ -110,7 +110,6 @@ export function createProgram() {
         .description('Run code generation.')
         .addOption(schemaOption)
         .addOption(new Option('-o, --output <path>', 'default output directory for built-in plugins'))
-        .addOption(configOption)
         .addOption(new Option('--no-default-plugins', 'do not run default plugins'))
         .addOption(new Option('--no-compile', 'do not compile the output of built-in plugins'))
         .addOption(noVersionCheckOption)
diff --git a/packages/schema/src/language-server/validator/datamodel-validator.ts b/packages/schema/src/language-server/validator/datamodel-validator.ts
index 3e4517444..ac727b917 100644
--- a/packages/schema/src/language-server/validator/datamodel-validator.ts
+++ b/packages/schema/src/language-server/validator/datamodel-validator.ts
@@ -6,7 +6,7 @@ import {
     isStringLiteral,
     ReferenceExpr,
 } from '@zenstackhq/language/ast';
-import { analyzePolicies, getLiteral, getModelIdFields, getModelUniqueFields, isDelegateModel } from '@zenstackhq/sdk';
+import { getLiteral, getModelIdFields, getModelUniqueFields, isDelegateModel } from '@zenstackhq/sdk';
 import { AstNode, DiagnosticInfo, getDocument, ValidationAcceptor } from 'langium';
 import { getModelFieldsWithBases } from '../../utils/ast-utils';
 import { IssueCodes, SCALAR_TYPES } from '../constants';
@@ -34,23 +34,19 @@ export default class DataModelValidator implements AstValidator<DataModel> {
         const modelUniqueFields = getModelUniqueFields(dm);
 
         if (
+            !dm.isAbstract &&
             idFields.length === 0 &&
             modelLevelIds.length === 0 &&
             uniqueFields.length === 0 &&
             modelUniqueFields.length === 0
         ) {
-            const { allows, denies, hasFieldValidation } = analyzePolicies(dm);
-            if (allows.length > 0 || denies.length > 0 || hasFieldValidation) {
-                // TODO: relax this requirement to require only @unique fields
-                // when access policies or field validation is used, require an @id field
-                accept(
-                    'error',
-                    'Model must include a field with @id or @unique attribute, or a model-level @@id or @@unique attribute to use access policies',
-                    {
-                        node: dm,
-                    }
-                );
-            }
+            accept(
+                'error',
+                'Model must have at least one unique criteria. Either mark a single field with `@id`, `@unique` or add a multi field criterion with `@@id([])` or `@@unique([])` to the model.',
+                {
+                    node: dm,
+                }
+            );
         } else if (idFields.length > 0 && modelLevelIds.length > 0) {
             accept('error', 'Model cannot have both field-level @id and model-level @@id attributes', {
                 node: dm,
diff --git a/packages/schema/src/language-server/validator/function-invocation-validator.ts b/packages/schema/src/language-server/validator/function-invocation-validator.ts
index 50b974a53..a6af730f2 100644
--- a/packages/schema/src/language-server/validator/function-invocation-validator.ts
+++ b/packages/schema/src/language-server/validator/function-invocation-validator.ts
@@ -57,6 +57,7 @@ export default class FunctionInvocationValidator implements AstValidator<Express
                 .with('@default', () => ExpressionContext.DefaultValue)
                 .with(P.union('@@allow', '@@deny', '@allow', '@deny'), () => ExpressionContext.AccessPolicy)
                 .with('@@validate', () => ExpressionContext.ValidationRule)
+                .with('@@index', () => ExpressionContext.Index)
                 .otherwise(() => undefined);
 
             // get the context allowed for the function
diff --git a/packages/schema/src/language-server/zmodel-completion-provider.ts b/packages/schema/src/language-server/zmodel-completion-provider.ts
index e100c870a..cd6dae0ca 100644
--- a/packages/schema/src/language-server/zmodel-completion-provider.ts
+++ b/packages/schema/src/language-server/zmodel-completion-provider.ts
@@ -61,7 +61,7 @@ export class ZModelCompletionProvider extends DefaultCompletionProvider {
         if (isDataModelAttribute(context.node) || isDataModelFieldAttribute(context.node)) {
             const completions = this.getCompletionFromHint(context.node);
             if (completions) {
-                completions.forEach(acceptor);
+                completions.forEach((c) => acceptor(context, c));
                 return;
             }
         }
@@ -131,7 +131,7 @@ export class ZModelCompletionProvider extends DefaultCompletionProvider {
             return;
         }
 
-        const customAcceptor = (item: CompletionValueItem) => {
+        const customAcceptor = (context: CompletionContext, item: CompletionValueItem) => {
             // attributes starting with @@@ are for internal use only
             if (item.insertText?.startsWith('@@@') || item.label?.startsWith('@@@')) {
                 return;
@@ -156,7 +156,7 @@ export class ZModelCompletionProvider extends DefaultCompletionProvider {
                     return;
                 }
             }
-            acceptor(item);
+            acceptor(context, item);
         };
 
         return super.completionForCrossReference(context, crossRef, customAcceptor);
@@ -168,11 +168,11 @@ export class ZModelCompletionProvider extends DefaultCompletionProvider {
         keyword: any,
         acceptor: CompletionAcceptor
     ): MaybePromise<void> {
-        const customAcceptor = (item: CompletionValueItem) => {
+        const customAcceptor = (context: CompletionContext, item: CompletionValueItem) => {
             if (!this.filterKeywordForContext(context, keyword.value)) {
                 return;
             }
-            acceptor(item);
+            acceptor(context, item);
         };
         return super.completionForKeyword(context, keyword, customAcceptor);
     }
diff --git a/packages/schema/src/language-server/zmodel-linker.ts b/packages/schema/src/language-server/zmodel-linker.ts
index 5ab841c96..13de8b968 100644
--- a/packages/schema/src/language-server/zmodel-linker.ts
+++ b/packages/schema/src/language-server/zmodel-linker.ts
@@ -470,13 +470,6 @@ export class ZModelLinker extends DefaultLinker {
     }
 
     private resolveDataModel(node: DataModel, document: LangiumDocument<AstNode>, extraScopes: ScopeProvider[]) {
-        // if (node.superTypes.length > 0) {
-        //     const providers = node.superTypes.map(
-        //         (superType) => (name: string) => superType.ref?.fields.find((f) => f.name === name)
-        //     );
-        //     extraScopes = [...providers, ...extraScopes];
-        // }
-
         return this.resolveDefault(node, document, extraScopes);
     }
 
diff --git a/packages/schema/src/language-server/zmodel-module.ts b/packages/schema/src/language-server/zmodel-module.ts
index 07dc223e0..c0c66ce43 100644
--- a/packages/schema/src/language-server/zmodel-module.ts
+++ b/packages/schema/src/language-server/zmodel-module.ts
@@ -2,12 +2,15 @@ import { ZModelGeneratedModule, ZModelGeneratedSharedModule } from '@zenstackhq/
 import {
     DefaultConfigurationProvider,
     DefaultDocumentBuilder,
+    DefaultFuzzyMatcher,
     DefaultIndexManager,
     DefaultLangiumDocumentFactory,
     DefaultLangiumDocuments,
     DefaultLanguageServer,
+    DefaultNodeKindProvider,
     DefaultServiceRegistry,
     DefaultSharedModuleContext,
+    DefaultWorkspaceSymbolProvider,
     LangiumDefaultSharedServices,
     LangiumServices,
     LangiumSharedServices,
@@ -77,6 +80,7 @@ export const ZModelModule: Module<ZModelServices, PartialLangiumServices & ZMode
 };
 
 // this duplicates createDefaultSharedModule except that a custom WorkspaceManager is used
+// TODO: avoid this duplication
 export function createSharedModule(
     context: DefaultSharedModuleContext
 ): Module<LangiumSharedServices, LangiumDefaultSharedServices> {
@@ -85,6 +89,9 @@ export function createSharedModule(
         lsp: {
             Connection: () => context.connection,
             LanguageServer: (services) => new DefaultLanguageServer(services),
+            WorkspaceSymbolProvider: (services) => new DefaultWorkspaceSymbolProvider(services),
+            NodeKindProvider: () => new DefaultNodeKindProvider(),
+            FuzzyMatcher: () => new DefaultFuzzyMatcher(),
         },
         workspace: {
             LangiumDocuments: (services) => new DefaultLangiumDocuments(services),
diff --git a/packages/schema/src/plugins/prisma/prisma-builder.ts b/packages/schema/src/plugins/prisma/prisma-builder.ts
index b65313940..594913f8c 100644
--- a/packages/schema/src/plugins/prisma/prisma-builder.ts
+++ b/packages/schema/src/plugins/prisma/prisma-builder.ts
@@ -293,7 +293,7 @@ export class FieldReference {
 }
 
 export class FieldReferenceArg {
-    constructor(public name: 'sort', public value: 'Asc' | 'Desc') {}
+    constructor(public name: string, public value: string) {}
 
     toString(): string {
         return `${this.name}: ${this.value}`;
@@ -309,10 +309,10 @@ export class FunctionCall {
 }
 
 export class FunctionCallArg {
-    constructor(public name: string | undefined, public value: string) {}
+    constructor(public value: string) {}
 
     toString(): string {
-        return this.name ? `${this.name}: ${this.value}` : this.value;
+        return this.value;
     }
 }
 
diff --git a/packages/schema/src/plugins/prisma/schema-generator.ts b/packages/schema/src/plugins/prisma/schema-generator.ts
index bfc0cf770..6592d83b5 100644
--- a/packages/schema/src/plugins/prisma/schema-generator.ts
+++ b/packages/schema/src/plugins/prisma/schema-generator.ts
@@ -232,6 +232,10 @@ export class PrismaSchemaGenerator {
         return JSON.stringify(expr.value);
     }
 
+    private exprToText(expr: Expression) {
+        return new ZModelCodeGenerator({ quote: 'double' }).generate(expr);
+    }
+
     private generateGenerator(prisma: PrismaModel, decl: GeneratorDecl, options: PluginOptions) {
         const generator = prisma.addGenerator(
             decl.name,
@@ -573,7 +577,7 @@ export class PrismaSchemaGenerator {
                 'FieldReference',
                 new PrismaFieldReference(
                     resolved(node.target).name,
-                    node.args.map((arg) => new PrismaFieldReferenceArg(arg.name, arg.value))
+                    node.args.map((arg) => new PrismaFieldReferenceArg(arg.name, this.exprToText(arg.value)))
                 )
             );
         } else if (isInvocationExpr(node)) {
@@ -596,7 +600,7 @@ export class PrismaSchemaGenerator {
                         throw new PluginError(name, 'Function call argument must be literal or null');
                     });
 
-                return new PrismaFunctionCallArg(arg.name, val);
+                return new PrismaFunctionCallArg(val);
             })
         );
     }
diff --git a/packages/schema/src/plugins/zod/generator.ts b/packages/schema/src/plugins/zod/generator.ts
index 19ce18a3b..a09c4ad73 100644
--- a/packages/schema/src/plugins/zod/generator.ts
+++ b/packages/schema/src/plugins/zod/generator.ts
@@ -395,7 +395,7 @@ async function generateModelSchema(model: DataModel, project: Project, output: s
         ////////////////////////////////////////////////
 
         // schema for validating prisma create input (all fields optional)
-        let prismaCreateSchema = makePartial('baseSchema');
+        let prismaCreateSchema = makePassthrough(makePartial('baseSchema'));
         if (refineFuncName) {
             prismaCreateSchema = `${refineFuncName}(${prismaCreateSchema})`;
         }
@@ -501,3 +501,7 @@ function makeOmit(schema: string, fields: string[]) {
 function makeMerge(schema1: string, schema2: string): string {
     return `${schema1}.merge(${schema2})`;
 }
+
+function makePassthrough(schema: string) {
+    return `${schema}.passthrough()`;
+}
diff --git a/packages/schema/src/res/stdlib.zmodel b/packages/schema/src/res/stdlib.zmodel
index 721dee538..fd470efb8 100644
--- a/packages/schema/src/res/stdlib.zmodel
+++ b/packages/schema/src/res/stdlib.zmodel
@@ -61,6 +61,9 @@ enum ExpressionContext {
 
     // used in @@validate
     ValidationRule
+
+    // used in @@index
+    Index
 }
 
 /**
@@ -200,7 +203,7 @@ attribute @@@completionHint(_ values: String[])
  * @param sort: Allows you to specify in what order the entries of the ID are stored in the database. The available options are Asc and Desc.
  * @param clustered: Defines whether the ID is clustered or non-clustered. Defaults to true.
  */
-attribute @id(map: String?, length: Int?, sort: String?, clustered: Boolean?) @@@prisma
+attribute @id(map: String?, length: Int?, sort: SortOrder?, clustered: Boolean?) @@@prisma
 
 /**
  * Defines a default value for a field.
@@ -215,7 +218,7 @@ attribute @default(_ value: ContextType, map: String?) @@@prisma
  * @param sort: Allows you to specify in what order the entries of the constraint are stored in the database. The available options are Asc and Desc.
  * @param clustered: Boolean	Defines whether the constraint is clustered or non-clustered. Defaults to false.
  */
-attribute @unique(map: String?, length: Int?, sort: String?, clustered: Boolean?) @@@prisma
+attribute @unique(map: String?, length: Int?, sort: SortOrder?, clustered: Boolean?) @@@prisma
 
 /**
  * Defines a multi-field ID (composite ID) on the model.
@@ -227,7 +230,7 @@ attribute @unique(map: String?, length: Int?, sort: String?, clustered: Boolean?
  * @param sort: Allows you to specify in what order the entries of the ID are stored in the database. The available options are Asc and Desc.
  * @param clustered: Defines whether the ID is clustered or non-clustered. Defaults to true.
  */
-attribute @@id(_ fields: FieldReference[], name: String?, map: String?, length: Int?, sort: String?, clustered: Boolean?) @@@prisma
+attribute @@id(_ fields: FieldReference[], name: String?, map: String?, length: Int?, sort: SortOrder?, clustered: Boolean?) @@@prisma
 
 /**
  * Defines a compound unique constraint for the specified fields.
@@ -238,7 +241,7 @@ attribute @@id(_ fields: FieldReference[], name: String?, map: String?, length:
  * @param sort: Allows you to specify in what order the entries of the constraint are stored in the database. The available options are Asc and Desc.
  * @param clustered: Boolean	Defines whether the constraint is clustered or non-clustered. Defaults to false.
  */
-attribute @@unique(_ fields: FieldReference[], name: String?, map: String?, length: Int?, sort: String?, clustered: Boolean?) @@@prisma
+attribute @@unique(_ fields: FieldReference[], name: String?, map: String?, length: Int?, sort: SortOrder?, clustered: Boolean?) @@@prisma
 
 /**
  * Index types
@@ -252,6 +255,84 @@ enum IndexType {
     Brin
 }
 
+/**
+ * Operator class for index
+ */
+enum IndexOperatorClass {
+    // GIN
+    ArrayOps
+    JsonbOps
+    JsonbPathOps
+
+    // Gist
+    InetOps
+
+    // SpGist
+    TextOps
+
+    // BRIN
+    BitMinMaxOps
+    VarBitMinMaxOps
+    BpcharBloomOps
+    BpcharMinMaxOps
+    ByteaBloomOps
+    ByteaMinMaxOps
+    DateBloomOps
+    DateMinMaxOps
+    DateMinMaxMultiOps
+    Float4BloomOps
+    Float4MinMaxOps
+    Float4MinMaxMultiOps
+    Float8BloomOps
+    Float8MinMaxOps
+    Float8MinMaxMultiOps
+    InetInclusionOps
+    InetBloomOps
+    InetMinMaxOps
+    InetMinMaxMultiOps
+    Int2BloomOps
+    Int2MinMaxOps
+    Int2MinMaxMultiOps
+    Int4BloomOps
+    Int4MinMaxOps
+    Int4MinMaxMultiOps
+    Int8BloomOps
+    Int8MinMaxOps
+    Int8MinMaxMultiOps
+    NumericBloomOps
+    NumericMinMaxOps
+    NumericMinMaxMultiOps
+    OidBloomOps
+    OidMinMaxOps
+    OidMinMaxMultiOps
+    TextBloomOps
+    TextMinMaxOps
+    TextMinMaxMultiOps
+    TimestampBloomOps
+    TimestampMinMaxOps
+    TimestampMinMaxMultiOps
+    TimestampTzBloomOps
+    TimestampTzMinMaxOps
+    TimestampTzMinMaxMultiOps
+    TimeBloomOps
+    TimeMinMaxOps
+    TimeMinMaxMultiOps
+    TimeTzBloomOps
+    TimeTzMinMaxOps
+    TimeTzMinMaxMultiOps
+    UuidBloomOps
+    UuidMinMaxOps
+    UuidMinMaxMultiOps
+}
+
+/**
+ * Index sort order
+ */
+enum SortOrder {
+    Asc
+    Desc
+}
+
 /**
  * Defines an index in the database.
  *
@@ -263,7 +344,7 @@ enum IndexType {
  * @params clustered: Defines whether the index is clustered or non-clustered. Defaults to false.
  * @params type: Allows you to specify an index access method. Defaults to BTree.
  */
-attribute @@index(_ fields: FieldReference[], name: String?, map: String?, length: Int?, sort: String?, clustered: Boolean?, type: IndexType?) @@@prisma
+attribute @@index(_ fields: FieldReference[], name: String?, map: String?, length: Int?, sort: SortOrder?, clustered: Boolean?, type: IndexType?) @@@prisma
 
 /**
  * Defines meta information about the relation.
@@ -604,7 +685,8 @@ attribute @@prisma.passthrough(_ text: String)
  */
 attribute @@delegate(_ discriminator: FieldReference)
 
-// /**
-//  * Marks a field to be the discriminator that identifies model's type in a polymorphic hierarchy.
-//  */
-// attribute @discriminator()
+/**
+ * Used for specifying operator classes for GIN index.
+ */
+function raw(value: String): Any {
+} @@@expressionContext([Index])
diff --git a/packages/schema/tests/generator/prisma-builder.test.ts b/packages/schema/tests/generator/prisma-builder.test.ts
index 48e465362..a3944401c 100644
--- a/packages/schema/tests/generator/prisma-builder.test.ts
+++ b/packages/schema/tests/generator/prisma-builder.test.ts
@@ -102,7 +102,7 @@ describe('Prisma Builder Tests', () => {
                     undefined,
                     new AttributeArgValue(
                         'FunctionCall',
-                        new FunctionCall('dbgenerated', [new FunctionCallArg(undefined, '"timestamp_id()"')])
+                        new FunctionCall('dbgenerated', [new FunctionCallArg('"timestamp_id()"')])
                     )
                 ),
             ]),
diff --git a/packages/schema/tests/schema/all-features.zmodel b/packages/schema/tests/schema/all-features.zmodel
index c47a7cf79..b567093fe 100644
--- a/packages/schema/tests/schema/all-features.zmodel
+++ b/packages/schema/tests/schema/all-features.zmodel
@@ -40,7 +40,7 @@ model Space extends Base {
     createdAt DateTime @default(now())
     updatedAt DateTime @updatedAt
     name String @length(4, 50)
-    slug String @unique @length(4, 16)
+    slug String @length(4, 16)
     owner User? @relation(fields: [ownerId], references: [id])
     ownerId String?
     members SpaceUser[]
@@ -58,6 +58,8 @@ model Space extends Base {
 
     // space admin can update and delete
     @@allow('update,delete', members?[user == auth() && role == ADMIN])
+
+    @@index([slug(ops: raw("gin_trgm_ops"))], type: Gin)
 }
 
 /*
diff --git a/packages/schema/tests/schema/parser.test.ts b/packages/schema/tests/schema/parser.test.ts
index 9b4150cd5..25ada5ceb 100644
--- a/packages/schema/tests/schema/parser.test.ts
+++ b/packages/schema/tests/schema/parser.test.ts
@@ -224,7 +224,6 @@ describe('Parsing Tests', () => {
         expect(((model.attributes[1].args[0].value as ArrayExpr).items[0] as ReferenceExpr).args[0]).toEqual(
             expect.objectContaining({
                 name: 'sort',
-                value: 'Asc',
             })
         );
 
@@ -232,7 +231,6 @@ describe('Parsing Tests', () => {
         expect((model.attributes[2].args[0].value as ReferenceExpr).args[0]).toEqual(
             expect.objectContaining({
                 name: 'sort',
-                value: 'Desc',
             })
         );
     });
diff --git a/packages/schema/tests/schema/validation/attribute-validation.test.ts b/packages/schema/tests/schema/validation/attribute-validation.test.ts
index dfc1d650c..ac87665b1 100644
--- a/packages/schema/tests/schema/validation/attribute-validation.test.ts
+++ b/packages/schema/tests/schema/validation/attribute-validation.test.ts
@@ -161,11 +161,11 @@ describe('Attribute tests', () => {
             model A {
                 x Int
                 y String
-                @@id([x, y], name: 'x_y', map: '_x_y', length: 10, sort: 'Asc', clustered: true)
+                @@id([x, y], name: 'x_y', map: '_x_y', length: 10, sort: Asc, clustered: true)
             }
 
             model B {
-                id String @id(map: '_id', length: 10, sort: 'Asc', clustered: true)
+                id String @id(map: '_id', length: 10, sort: Asc, clustered: true)
             }
         `);
 
@@ -175,7 +175,7 @@ describe('Attribute tests', () => {
                 id String @id
                 x Int
                 y String
-                @@unique([x, y], name: 'x_y', map: '_x_y', length: 10, sort: 'Asc', clustered: true)
+                @@unique([x, y], name: 'x_y', map: '_x_y', length: 10, sort: Asc, clustered: true)
             }
         `);
 
@@ -193,7 +193,7 @@ describe('Attribute tests', () => {
         ${prelude}
             model A {
                 id String @id
-                x Int @unique(map: '_x', length: 10, sort: 'Asc', clustered: true)
+                x Int @unique(map: '_x', length: 10, sort: Asc, clustered: true)
             }
         `);
 
@@ -222,7 +222,7 @@ describe('Attribute tests', () => {
                 id String @id
                 x Int
                 y String
-                @@index([x(sort: Asc), y(sort: Desc)], name: 'myindex', map: '_myindex', length: 10, sort: 'asc', clustered: true, type: BTree)
+                @@index([x(sort: Asc), y(sort: Desc)], name: 'myindex', map: '_myindex', length: 10, sort: Asc, clustered: true, type: BTree)
             }
         `);
 
@@ -251,6 +251,7 @@ describe('Attribute tests', () => {
             ${prelude}
 
             model _String {
+                id String @id
                 _string String @db.String
                 _string1 String @db.String(1)
                 _text String @db.Text
@@ -275,6 +276,7 @@ describe('Attribute tests', () => {
             }
 
             model _Boolean {
+                id String @id
                 _boolean Boolean @db.Boolean
                 _bit Boolean @db.Bit
                 _bit1 Boolean @db.Bit(1)
@@ -283,6 +285,7 @@ describe('Attribute tests', () => {
             }
 
             model _Int {
+                id String @id
                 _int Int @db.Int
                 _integer Int @db.Integer
                 _smallInt Int @db.SmallInt
@@ -298,12 +301,14 @@ describe('Attribute tests', () => {
             }
 
             model _BigInt {
+                id String @id
                 _bigInt BigInt @db.BigInt
                 _unsignedBigInt BigInt @db.UnsignedBigInt
                 _int8 BigInt @db.Int8
             }
 
             model _FloatDecimal {
+                id String @id
                 _float Float @db.Float
                 _decimal Decimal @db.Decimal
                 _decimal1 Decimal @db.Decimal(10, 2)
@@ -318,6 +323,7 @@ describe('Attribute tests', () => {
             }
 
             model _DateTime {
+                id String @id
                 _dateTime DateTime @db.DateTime
                 _dateTime2 DateTime @db.DateTime2
                 _smallDateTime DateTime @db.SmallDateTime
@@ -334,11 +340,13 @@ describe('Attribute tests', () => {
             }
 
             model _Json {
+                id String @id
                 _json Json @db.Json
                 _jsonb Json @db.JsonB
             }
 
             model _Bytes {
+                id String @id
                 _bytes Bytes @db.Bytes
                 _byteA Bytes @db.ByteA
                 _longBlob Bytes @db.LongBlob
@@ -1150,6 +1158,7 @@ describe('Attribute tests', () => {
             }
 
             model M {
+                id String @id
                 e E @default(E1)
             }
         `);
diff --git a/packages/schema/tests/schema/validation/datamodel-validation.test.ts b/packages/schema/tests/schema/validation/datamodel-validation.test.ts
index ec3be8f36..19535d5dd 100644
--- a/packages/schema/tests/schema/validation/datamodel-validation.test.ts
+++ b/packages/schema/tests/schema/validation/datamodel-validation.test.ts
@@ -120,16 +120,8 @@ describe('Data Model Validation Tests', () => {
     });
 
     it('id field', async () => {
-        // no need for '@id' field when there's no access policy or field validation
-        await loadModel(`
-            ${prelude}
-            model M {
-                x Int
-            }
-        `);
-
         const err =
-            'Model must include a field with @id or @unique attribute, or a model-level @@id or @@unique attribute to use access policies';
+            'Model must have at least one unique criteria. Either mark a single field with `@id`, `@unique` or add a multi field criterion with `@@id([])` or `@@unique([])` to the model.';
 
         expect(
             await loadModelWithError(`
@@ -630,10 +622,9 @@ describe('Data Model Validation Tests', () => {
                         b String
                     }
                 `);
-        expect(errors.length).toBe(1);
 
         expect(errors[0]).toEqual(
-            `Model A cannot be extended because it's neither abstract nor marked as "@@delegate"`
+            'Model must have at least one unique criteria. Either mark a single field with `@id`, `@unique` or add a multi field criterion with `@@id([])` or `@@unique([])` to the model.'
         );
 
         // relation incomplete from multiple level inheritance
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index ac8bcaf1d..8d81caac9 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -23,7 +23,7 @@
         "@prisma/internals-v5": "npm:@prisma/internals@^5.0.0",
         "@zenstackhq/language": "workspace:*",
         "@zenstackhq/runtime": "workspace:*",
-        "langium": "1.2.0",
+        "langium": "1.3.1",
         "lower-case-first": "^2.0.2",
         "prettier": "^2.8.3 || 3.x",
         "semver": "^7.5.2",
diff --git a/packages/sdk/src/constants.ts b/packages/sdk/src/constants.ts
index e038c6958..1e0d22d67 100644
--- a/packages/sdk/src/constants.ts
+++ b/packages/sdk/src/constants.ts
@@ -12,6 +12,7 @@ export enum ExpressionContext {
     DefaultValue = 'DefaultValue',
     AccessPolicy = 'AccessPolicy',
     ValidationRule = 'ValidationRule',
+    Index = 'Index',
 }
 
 export const STD_LIB_MODULE_NAME = 'stdlib.zmodel';
diff --git a/packages/sdk/src/zmodel-code-generator.ts b/packages/sdk/src/zmodel-code-generator.ts
index 1b1f001e1..96aaa87d9 100644
--- a/packages/sdk/src/zmodel-code-generator.ts
+++ b/packages/sdk/src/zmodel-code-generator.ts
@@ -49,6 +49,7 @@ export interface ZModelCodeOptions {
     binaryExprNumberOfSpaces: number;
     unaryExprNumberOfSpaces: number;
     indent: number;
+    quote: 'single' | 'double';
 }
 
 // a registry of generation handlers marked with @gen
@@ -75,6 +76,7 @@ export class ZModelCodeGenerator {
             binaryExprNumberOfSpaces: options?.binaryExprNumberOfSpaces ?? 1,
             unaryExprNumberOfSpaces: options?.unaryExprNumberOfSpaces ?? 0,
             indent: options?.indent ?? 4,
+            quote: options?.quote ?? 'single',
         };
     }
 
@@ -224,7 +226,7 @@ ${ast.fields.map((x) => this.indent + this.generate(x)).join('\n')}${
 
     @gen(StringLiteral)
     private _generateLiteralExpr(ast: LiteralExpr) {
-        return `'${ast.value}'`;
+        return this.options.quote === 'single' ? `'${ast.value}'` : `"${ast.value}"`;
     }
 
     @gen(NumberLiteral)
@@ -265,7 +267,7 @@ ${ast.fields.map((x) => this.indent + this.generate(x)).join('\n')}${
 
     @gen(ReferenceArg)
     private _generateReferenceArg(ast: ReferenceArg) {
-        return `${ast.name}:${ast.value}`;
+        return `${ast.name}:${this.generate(ast.value)}`;
     }
 
     @gen(MemberAccessExpr)
@@ -321,7 +323,7 @@ ${ast.fields.map((x) => this.indent + this.generate(x)).join('\n')}${
     }
 
     private argument(ast: Argument) {
-        return `${ast.name ? ast.name + ': ' : ''}${this.generate(ast.value)}`;
+        return this.generate(ast.value);
     }
 
     private get binaryExprSpace() {
diff --git a/packages/testtools/package.json b/packages/testtools/package.json
index 84eb36b60..3472ddca0 100644
--- a/packages/testtools/package.json
+++ b/packages/testtools/package.json
@@ -24,7 +24,7 @@
     "@zenstackhq/runtime": "workspace:*",
     "@zenstackhq/sdk": "workspace:*",
     "json5": "^2.2.3",
-    "langium": "1.2.0",
+    "langium": "1.3.1",
     "pg": "^8.11.1",
     "tmp": "^0.2.1",
     "vscode-uri": "^3.0.6",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9c8f28205..602861b14 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -69,12 +69,12 @@ importers:
   packages/language:
     dependencies:
       langium:
-        specifier: 1.2.0
-        version: 1.2.0
+        specifier: 1.3.1
+        version: 1.3.1
     devDependencies:
       langium-cli:
-        specifier: 1.2.0
-        version: 1.2.0
+        specifier: 1.3.1
+        version: 1.3.1
       plist2:
         specifier: ^1.1.3
         version: 1.1.3
@@ -487,8 +487,8 @@ importers:
         specifier: ^5.0.1
         version: 5.0.1
       langium:
-        specifier: 1.2.0
-        version: 1.2.0
+        specifier: 1.3.1
+        version: 1.3.1
       lower-case-first:
         specifier: ^2.0.2
         version: 2.0.2
@@ -624,8 +624,8 @@ importers:
         specifier: workspace:*
         version: link:../runtime/dist
       langium:
-        specifier: 1.2.0
-        version: 1.2.0
+        specifier: 1.3.1
+        version: 1.3.1
       lower-case-first:
         specifier: ^2.0.2
         version: 2.0.2
@@ -748,8 +748,8 @@ importers:
         specifier: ^2.2.3
         version: 2.2.3
       langium:
-        specifier: 1.2.0
-        version: 1.2.0
+        specifier: 1.3.1
+        version: 1.3.1
       pg:
         specifier: ^8.11.1
         version: 8.11.1
@@ -10270,8 +10270,8 @@ packages:
     resolution: {integrity: sha512-dWl0Dbjm6Xm+kDxhPQJsCBTxrJzuGl0aP9rhr+TG8D3l+GL90N8O8lYUi7dTSAN2uuDqCtNgb6aEuQH5wsiV8Q==}
     dev: true
 
-  /langium-cli@1.2.0:
-    resolution: {integrity: sha512-DPyJUd4Hj8+OBNEcAQyJtW6e38+UPd758gTI7Ep0r/sDogrwJ/GJHx5nGA+r0ygpNcDPG+mS9Hw8Y05uCNNcoQ==}
+  /langium-cli@1.3.1:
+    resolution: {integrity: sha512-9faKpioKCjBD0Z4y165+wQlDFiDHOXYBlhPVgbV+neSnSB70belZLNfykAVa564360h7Br/5PogR5jW2n/tOKw==}
     engines: {node: '>=14.0.0'}
     hasBin: true
     dependencies:
@@ -10279,12 +10279,20 @@ packages:
       commander: 10.0.1
       fs-extra: 11.1.1
       jsonschema: 1.4.1
-      langium: 1.2.0
+      langium: 1.3.1
+      langium-railroad: 1.3.0
       lodash: 4.17.21
     dev: true
 
-  /langium@1.2.0:
-    resolution: {integrity: sha512-jFSptpFljYo9ZTHrq/GZflMUXiKo5KBNtsaIJtnIzDm9zC2FxsxejEFAtNL09262RVQt+zFeF/2iLAShFTGitw==}
+  /langium-railroad@1.3.0:
+    resolution: {integrity: sha512-I3gx79iF+Qpn2UjzfHLf2GENAD9mPdSZHL3juAZLBsxznw4se7MBrJX32oPr/35DTjU9q99wFCQoCXu7mcf+Bg==}
+    dependencies:
+      langium: 1.3.1
+      railroad-diagrams: 1.0.0
+    dev: true
+
+  /langium@1.3.1:
+    resolution: {integrity: sha512-xC+DnAunl6cZIgYjRpgm3s1kYAB5/Wycsj24iYaXG9uai7SgvMaFZSrRvdA5rUK/lSta/CRvgF+ZFoEKEOFJ5w==}
     engines: {node: '>=14.0.0'}
     dependencies:
       chevrotain: 10.4.2
@@ -12657,6 +12665,10 @@ packages:
     resolution: {integrity: sha512-pNsHDxbGORSvuSScqNJ+3Km6QAVqk8CfsCBIEoDgpqLrkD2f3QM4I7d1ozJJ172OmIcoUcerZaNWqtLkRXTV3A==}
     dev: true
 
+  /railroad-diagrams@1.0.0:
+    resolution: {integrity: sha512-cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A==}
+    dev: true
+
   /randombytes@2.1.0:
     resolution: {integrity: sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==}
     dependencies:
diff --git a/tests/integration/tests/cli/init.test.ts b/tests/integration/tests/cli/init.test.ts
index 6b5ae7c3a..2dc9bdbf6 100644
--- a/tests/integration/tests/cli/init.test.ts
+++ b/tests/integration/tests/cli/init.test.ts
@@ -9,6 +9,7 @@ import { createProgram } from '../../../../packages/schema/src/cli';
 import { execSync } from '../../../../packages/schema/src/utils/exec-utils';
 import { createNpmrc } from './share';
 
+// Skipping these tests as they seem to cause hangs intermittently when running with other tests
 // eslint-disable-next-line jest/no-disabled-tests
 describe.skip('CLI init command tests', () => {
     let origDir: string;
diff --git a/tests/integration/tests/enhancements/with-omit/with-omit.test.ts b/tests/integration/tests/enhancements/with-omit/with-omit.test.ts
index 67b97776a..f7fcc7266 100644
--- a/tests/integration/tests/enhancements/with-omit/with-omit.test.ts
+++ b/tests/integration/tests/enhancements/with-omit/with-omit.test.ts
@@ -76,4 +76,84 @@ describe('Omit test', () => {
             expect(e.profile.image).toBeUndefined();
         });
     });
+
+    it('customization', async () => {
+        const { prisma, enhance } = await loadSchema(model, {
+            output: './zen',
+            enhancements: ['omit'],
+        });
+
+        const db = enhance(prisma, { loadPath: './zen' });
+        const r = await db.user.create({
+            include: { profile: true },
+            data: {
+                id: '1',
+                password: 'abc123',
+                profile: { create: { image: 'an image' } },
+            },
+        });
+        expect(r.password).toBeUndefined();
+        expect(r.profile.image).toBeUndefined();
+
+        const db1 = enhance(prisma, { modelMeta: require(path.resolve('./zen/model-meta')).default });
+        const r1 = await db1.user.create({
+            include: { profile: true },
+            data: {
+                id: '2',
+                password: 'abc123',
+                profile: { create: { image: 'an image' } },
+            },
+        });
+        expect(r1.password).toBeUndefined();
+        expect(r1.profile.image).toBeUndefined();
+    });
+
+    it('to-many', async () => {
+        const { enhance } = await loadSchema(
+            `
+            model User {
+                id String @id @default(cuid())
+                posts Post[]
+            
+                @@allow('all', true)
+            }
+            
+            model Post {
+                id String @id @default(cuid())
+                user User @relation(fields: [userId], references: [id])
+                userId String
+                images Image[]
+            
+                @@allow('all', true)
+            }
+
+            model Image {
+                id String @id @default(cuid())
+                post Post @relation(fields: [postId], references: [id])
+                postId String
+                url String @omit
+
+                @@allow('all', true)
+            }
+            `,
+            { enhancements: ['omit'] }
+        );
+
+        const db = enhance();
+        const r = await db.user.create({
+            include: { posts: { include: { images: true } } },
+            data: {
+                posts: {
+                    create: [
+                        { images: { create: { url: 'img1' } } },
+                        { images: { create: [{ url: 'img2' }, { url: 'img3' }] } },
+                    ],
+                },
+            },
+        });
+
+        expect(r.posts[0].images[0].url).toBeUndefined();
+        expect(r.posts[1].images[0].url).toBeUndefined();
+        expect(r.posts[1].images[1].url).toBeUndefined();
+    });
 });
diff --git a/tests/integration/tests/enhancements/with-policy/field-validation.test.ts b/tests/integration/tests/enhancements/with-policy/field-validation.test.ts
index ca71841db..16f56dddd 100644
--- a/tests/integration/tests/enhancements/with-policy/field-validation.test.ts
+++ b/tests/integration/tests/enhancements/with-policy/field-validation.test.ts
@@ -35,6 +35,8 @@ describe('With Policy: field validation', () => {
                 text3 String @length(min: 3)
                 text4 String @length(max: 5)
                 text5 String? @endsWith('xyz')
+                text6 String? @trim @lower
+                text7 String? @upper
 
                 @@allow('all', true)
             }
@@ -495,4 +497,61 @@ describe('With Policy: field validation', () => {
             })
         ).toResolveTruthy();
     });
+
+    it('string transformation', async () => {
+        await db.user.create({
+            data: {
+                id: '1',
+                password: 'abc123!@#',
+                email: 'who@myorg.com',
+                handle: 'user1',
+            },
+        });
+
+        await expect(
+            db.userData.create({
+                data: {
+                    userId: '1',
+                    a: 1,
+                    b: 0,
+                    c: -1,
+                    d: 0,
+                    text1: 'abc123',
+                    text2: 'def',
+                    text3: 'aaa',
+                    text4: 'abcab',
+                    text6: ' AbC ',
+                    text7: 'abc',
+                },
+            })
+        ).resolves.toMatchObject({ text6: 'abc', text7: 'ABC' });
+
+        await expect(
+            db.user.create({
+                data: {
+                    id: '2',
+                    password: 'abc123!@#',
+                    email: 'who@myorg.com',
+                    handle: 'user2',
+                    userData: {
+                        create: {
+                            a: 1,
+                            b: 0,
+                            c: -1,
+                            d: 0,
+                            text1: 'abc123',
+                            text2: 'def',
+                            text3: 'aaa',
+                            text4: 'abcab',
+                            text6: ' AbC ',
+                            text7: 'abc',
+                        },
+                    },
+                },
+                include: { userData: true },
+            })
+        ).resolves.toMatchObject({
+            userData: expect.objectContaining({ text6: 'abc', text7: 'ABC' }),
+        });
+    });
 });
diff --git a/tests/integration/tests/frameworks/trpc/generation.test.ts b/tests/integration/tests/frameworks/trpc/generation.test.ts
index 3c867bc0f..a58f5965d 100644
--- a/tests/integration/tests/frameworks/trpc/generation.test.ts
+++ b/tests/integration/tests/frameworks/trpc/generation.test.ts
@@ -21,6 +21,7 @@ describe('tRPC Routers Generation Tests', () => {
         `${path.join(__dirname, '../../../../../.build/zenstackhq-sdk-' + ver + '.tgz')}`,
         `${path.join(__dirname, '../../../../../.build/zenstackhq-runtime-' + ver + '.tgz')}`,
         `${path.join(__dirname, '../../../../../.build/zenstackhq-trpc-' + ver + '.tgz')}`,
+        `${path.join(__dirname, '../../../../../.build/zenstackhq-server-' + ver + '.tgz')}`,
     ];
     const deps = depPkgs.join(' ');
 
diff --git a/tests/integration/tests/regression/issue-965.test.ts b/tests/integration/tests/regression/issue-965.test.ts
new file mode 100644
index 000000000..79bd92075
--- /dev/null
+++ b/tests/integration/tests/regression/issue-965.test.ts
@@ -0,0 +1,53 @@
+import { loadModel, loadModelWithError } from '@zenstackhq/testtools';
+
+describe('Regression: issue 965', () => {
+    it('regression1', async () => {
+        await loadModel(`
+        abstract model Base {
+            id String @id @default(cuid())
+        }
+        
+        abstract model A {
+            URL String? @url
+        }
+        
+        abstract model B {
+            anotherURL String? @url
+        }
+        
+        abstract model C {
+            oneMoreURL String? @url
+        }
+        
+        model D extends Base, A, B {
+        }
+        
+        model E extends Base, B, C {
+        }`);
+    });
+
+    it('regression2', async () => {
+        await expect(
+            loadModelWithError(`
+        abstract model A {
+            URL String? @url
+        }
+        
+        abstract model B {
+            anotherURL String? @url
+        }
+        
+        abstract model C {
+            oneMoreURL String? @url
+        }
+        
+        model D extends A, B {
+        }
+        
+        model E extends B, C {
+        }`)
+        ).resolves.toContain(
+            'Model must have at least one unique criteria. Either mark a single field with `@id`, `@unique` or add a multi field criterion with `@@id([])` or `@@unique([])` to the model.'
+        );
+    });
+});
diff --git a/tests/integration/tests/regression/issue-971.test.ts b/tests/integration/tests/regression/issue-971.test.ts
new file mode 100644
index 000000000..40990aa6a
--- /dev/null
+++ b/tests/integration/tests/regression/issue-971.test.ts
@@ -0,0 +1,23 @@
+import { loadSchema } from '@zenstackhq/testtools';
+
+describe('Regression: issue 971', () => {
+    it('regression', async () => {
+        await loadSchema(
+            `
+            abstract model Level1 {
+                id String @id @default(cuid())
+                URL String?
+                @@validate(URL != null, "URL must be provided") // works
+            }
+            abstract model Level2 extends Level1 {
+                @@validate(URL != null, "URL must be provided") // works 
+            }
+            abstract model Level3 extends Level2 {
+                @@validate(URL != null, "URL must be provided") // doesn't work
+            }
+            model Foo extends Level3 {
+            }
+            `
+        );
+    });
+});
diff --git a/tests/integration/tests/regression/issue-992.test.ts b/tests/integration/tests/regression/issue-992.test.ts
new file mode 100644
index 000000000..40a1aac47
--- /dev/null
+++ b/tests/integration/tests/regression/issue-992.test.ts
@@ -0,0 +1,45 @@
+import { loadSchema } from '@zenstackhq/testtools';
+
+describe('Regression: issue 992', () => {
+    it('regression', async () => {
+        const { enhance, prisma } = await loadSchema(
+            `
+            model Product {
+                id String @id @default(cuid())
+                category Category @relation(fields: [categoryId], references: [id])
+                categoryId String
+              
+                deleted Int @default(0) @omit
+                @@deny('read', deleted != 0)
+                @@allow('all', true)
+            }
+              
+            model Category {
+                id String @id @default(cuid())
+                products Product[]
+                @@allow('all', true)
+            }
+            `
+        );
+
+        await prisma.category.create({
+            data: {
+                products: {
+                    create: [
+                        {
+                            deleted: 0,
+                        },
+                        {
+                            deleted: 0,
+                        },
+                    ],
+                },
+            },
+        });
+
+        const db = enhance();
+        const category = await db.category.findFirst({ include: { products: true } });
+        expect(category.products[0].deleted).toBeUndefined();
+        expect(category.products[1].deleted).toBeUndefined();
+    });
+});