diff --git a/actorQuery.ts b/actorQuery.ts
index 582089c..8f7d687 100644
--- a/actorQuery.ts
+++ b/actorQuery.ts
@@ -21,8 +21,10 @@ import { MatchFieldResult } from "./shared";
 import { MatchField } from "./shared";
 import { EntityType } from "./shared";
 import { BlockFilter } from "./shared";
+import { TruncatedObject } from "./shared";
 import { Actor } from "./actor";
 import { ResultHeader } from "./shared";
+import { QueryOptions } from "./shared";
 import { QueryEntityID } from "./shared";
 import { QueryProjectHeader } from "./shared";
 // 
@@ -41,9 +43,14 @@ export interface ActorByIdQuery {
      */
     IDs: QueryEntityID[];
     /**
-     * @generated from protobuf field: api.ActorQueryOptions Options = 3
+     * @deprecated
+     * @generated from protobuf field: api.ActorQueryOptions Options = 3 [deprecated = true]
      */
     Options?: ActorQueryOptions;
+    /**
+     * @generated from protobuf field: api.QueryOptions QueryOptions = 4
+     */
+    QueryOptions?: QueryOptions;
 }
 /**
  * @generated from protobuf message api.ActorByIdResult
@@ -57,6 +64,10 @@ export interface ActorByIdResult {
      * @generated from protobuf field: repeated api.Actor Objects = 2
      */
     Objects: Actor[];
+    /**
+     * @generated from protobuf field: repeated api.TruncatedObject TruncatedObjects = 3
+     */
+    TruncatedObjects: TruncatedObject[];
 }
 /**
  * @generated from protobuf message api.ActorByFilterQuery
@@ -83,7 +94,8 @@ export interface ActorByFilterQuery {
      */
     BlockFilters: BlockFilter[];
     /**
-     * @generated from protobuf field: api.ActorQueryOptions Options = 7
+     * @deprecated
+     * @generated from protobuf field: api.ActorQueryOptions Options = 7 [deprecated = true]
      */
     Options?: ActorQueryOptions;
     /**
@@ -94,6 +106,10 @@ export interface ActorByFilterQuery {
      * @generated from protobuf field: string UsageContextPath = 9
      */
     UsageContextPath: string;
+    /**
+     * @generated from protobuf field: api.QueryOptions QueryOptions = 10
+     */
+    QueryOptions?: QueryOptions;
 }
 /**
  * @generated from protobuf message api.ActorByFilterResult
@@ -111,6 +127,10 @@ export interface ActorByFilterResult {
      * @generated from protobuf field: string queryContext = 3
      */
     queryContext: string;
+    /**
+     * @generated from protobuf field: repeated api.TruncatedObject TruncatedObjects = 4
+     */
+    TruncatedObjects: TruncatedObject[];
 }
 /**
  * @generated from protobuf message api.ActorQueryOptions
@@ -165,7 +185,8 @@ class ActorByIdQuery$Type extends MessageType<ActorByIdQuery> {
         super("api.ActorByIdQuery", [
             { no: 1, name: "Header", kind: "message", localName: "Header", jsonName: "Header", T: () => QueryProjectHeader, options: { "n1validate.rules": { message: { required: true } } } },
             { no: 2, name: "IDs", kind: "message", localName: "IDs", jsonName: "IDs", repeat: 2 /*RepeatType.UNPACKED*/, T: () => QueryEntityID, options: { "n1validate.rules": { repeated: { minItems: "1" } } } },
-            { no: 3, name: "Options", kind: "message", localName: "Options", jsonName: "Options", T: () => ActorQueryOptions }
+            { no: 3, name: "Options", kind: "message", localName: "Options", jsonName: "Options", T: () => ActorQueryOptions },
+            { no: 4, name: "QueryOptions", kind: "message", localName: "QueryOptions", jsonName: "QueryOptions", T: () => QueryOptions }
         ], { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_schema": { jsonSchema: { required: ["Header", "IDs"] } }, "api.messageType": "Query" });
     }
     create(value?: PartialMessage<ActorByIdQuery>): ActorByIdQuery {
@@ -186,9 +207,12 @@ class ActorByIdQuery$Type extends MessageType<ActorByIdQuery> {
                 case /* repeated api.QueryEntityID IDs */ 2:
                     message.IDs.push(QueryEntityID.internalBinaryRead(reader, reader.uint32(), options));
                     break;
-                case /* api.ActorQueryOptions Options */ 3:
+                case /* api.ActorQueryOptions Options = 3 [deprecated = true] */ 3:
                     message.Options = ActorQueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.Options);
                     break;
+                case /* api.QueryOptions QueryOptions */ 4:
+                    message.QueryOptions = QueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.QueryOptions);
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -207,9 +231,12 @@ class ActorByIdQuery$Type extends MessageType<ActorByIdQuery> {
         /* repeated api.QueryEntityID IDs = 2; */
         for (let i = 0; i < message.IDs.length; i++)
             QueryEntityID.internalBinaryWrite(message.IDs[i], writer.tag(2, WireType.LengthDelimited).fork(), options).join();
-        /* api.ActorQueryOptions Options = 3; */
+        /* api.ActorQueryOptions Options = 3 [deprecated = true]; */
         if (message.Options)
             ActorQueryOptions.internalBinaryWrite(message.Options, writer.tag(3, WireType.LengthDelimited).fork(), options).join();
+        /* api.QueryOptions QueryOptions = 4; */
+        if (message.QueryOptions)
+            QueryOptions.internalBinaryWrite(message.QueryOptions, writer.tag(4, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
@@ -225,12 +252,14 @@ class ActorByIdResult$Type extends MessageType<ActorByIdResult> {
     constructor() {
         super("api.ActorByIdResult", [
             { no: 1, name: "Header", kind: "message", localName: "Header", jsonName: "Header", T: () => ResultHeader },
-            { no: 2, name: "Objects", kind: "message", localName: "Objects", jsonName: "Objects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => Actor }
+            { no: 2, name: "Objects", kind: "message", localName: "Objects", jsonName: "Objects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => Actor },
+            { no: 3, name: "TruncatedObjects", kind: "message", localName: "TruncatedObjects", jsonName: "TruncatedObjects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => TruncatedObject }
         ], { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_schema": { jsonSchema: {} }, "api.messageType": "Result" });
     }
     create(value?: PartialMessage<ActorByIdResult>): ActorByIdResult {
         const message = globalThis.Object.create((this.messagePrototype!));
         message.Objects = [];
+        message.TruncatedObjects = [];
         if (value !== undefined)
             reflectionMergePartial<ActorByIdResult>(this, message, value);
         return message;
@@ -246,6 +275,9 @@ class ActorByIdResult$Type extends MessageType<ActorByIdResult> {
                 case /* repeated api.Actor Objects */ 2:
                     message.Objects.push(Actor.internalBinaryRead(reader, reader.uint32(), options));
                     break;
+                case /* repeated api.TruncatedObject TruncatedObjects */ 3:
+                    message.TruncatedObjects.push(TruncatedObject.internalBinaryRead(reader, reader.uint32(), options));
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -264,6 +296,9 @@ class ActorByIdResult$Type extends MessageType<ActorByIdResult> {
         /* repeated api.Actor Objects = 2; */
         for (let i = 0; i < message.Objects.length; i++)
             Actor.internalBinaryWrite(message.Objects[i], writer.tag(2, WireType.LengthDelimited).fork(), options).join();
+        /* repeated api.TruncatedObject TruncatedObjects = 3; */
+        for (let i = 0; i < message.TruncatedObjects.length; i++)
+            TruncatedObject.internalBinaryWrite(message.TruncatedObjects[i], writer.tag(3, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
@@ -284,7 +319,8 @@ class ActorByFilterQuery$Type extends MessageType<ActorByFilterQuery> {
             { no: 6, name: "BlockFilters", kind: "message", localName: "BlockFilters", jsonName: "BlockFilters", repeat: 2 /*RepeatType.UNPACKED*/, T: () => BlockFilter },
             { no: 7, name: "Options", kind: "message", localName: "Options", jsonName: "Options", T: () => ActorQueryOptions },
             { no: 8, name: "UsageContextEntity", kind: "enum", localName: "UsageContextEntity", jsonName: "UsageContextEntity", T: () => ["api.EntityType", EntityType], options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Optional : Entity to apply the restriction rules (on the path defined with UsageContextPath)", example: "\"For Actor, to limit the results according to Order ShipFrom restriction rules, define UsageContextEntity to Order and UsageContextPath to Payload.ShipFrom\"" } } },
-            { no: 9, name: "UsageContextPath", kind: "scalar", localName: "UsageContextPath", jsonName: "UsageContextPath", T: 9 /*ScalarType.STRING*/, options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Optional : Path of restriction rule to apply (UsageContextEntity should be defined)" } } }
+            { no: 9, name: "UsageContextPath", kind: "scalar", localName: "UsageContextPath", jsonName: "UsageContextPath", T: 9 /*ScalarType.STRING*/, options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Optional : Path of restriction rule to apply (UsageContextEntity should be defined)" } } },
+            { no: 10, name: "QueryOptions", kind: "message", localName: "QueryOptions", jsonName: "QueryOptions", T: () => QueryOptions }
         ], { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_schema": { jsonSchema: { required: ["Header"] } } });
     }
     create(value?: PartialMessage<ActorByFilterQuery>): ActorByFilterQuery {
@@ -315,7 +351,7 @@ class ActorByFilterQuery$Type extends MessageType<ActorByFilterQuery> {
                 case /* repeated api.BlockFilter BlockFilters */ 6:
                     message.BlockFilters.push(BlockFilter.internalBinaryRead(reader, reader.uint32(), options));
                     break;
-                case /* api.ActorQueryOptions Options */ 7:
+                case /* api.ActorQueryOptions Options = 7 [deprecated = true] */ 7:
                     message.Options = ActorQueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.Options);
                     break;
                 case /* api.EntityType UsageContextEntity */ 8:
@@ -324,6 +360,9 @@ class ActorByFilterQuery$Type extends MessageType<ActorByFilterQuery> {
                 case /* string UsageContextPath */ 9:
                     message.UsageContextPath = reader.string();
                     break;
+                case /* api.QueryOptions QueryOptions */ 10:
+                    message.QueryOptions = QueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.QueryOptions);
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -348,7 +387,7 @@ class ActorByFilterQuery$Type extends MessageType<ActorByFilterQuery> {
         /* repeated api.BlockFilter BlockFilters = 6; */
         for (let i = 0; i < message.BlockFilters.length; i++)
             BlockFilter.internalBinaryWrite(message.BlockFilters[i], writer.tag(6, WireType.LengthDelimited).fork(), options).join();
-        /* api.ActorQueryOptions Options = 7; */
+        /* api.ActorQueryOptions Options = 7 [deprecated = true]; */
         if (message.Options)
             ActorQueryOptions.internalBinaryWrite(message.Options, writer.tag(7, WireType.LengthDelimited).fork(), options).join();
         /* api.EntityType UsageContextEntity = 8; */
@@ -357,6 +396,9 @@ class ActorByFilterQuery$Type extends MessageType<ActorByFilterQuery> {
         /* string UsageContextPath = 9; */
         if (message.UsageContextPath !== "")
             writer.tag(9, WireType.LengthDelimited).string(message.UsageContextPath);
+        /* api.QueryOptions QueryOptions = 10; */
+        if (message.QueryOptions)
+            QueryOptions.internalBinaryWrite(message.QueryOptions, writer.tag(10, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
@@ -373,13 +415,15 @@ class ActorByFilterResult$Type extends MessageType<ActorByFilterResult> {
         super("api.ActorByFilterResult", [
             { no: 1, name: "Header", kind: "message", localName: "Header", jsonName: "Header", T: () => ResultHeader },
             { no: 2, name: "Objects", kind: "message", localName: "Objects", jsonName: "Objects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => Actor },
-            { no: 3, name: "queryContext", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
+            { no: 3, name: "queryContext", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
+            { no: 4, name: "TruncatedObjects", kind: "message", localName: "TruncatedObjects", jsonName: "TruncatedObjects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => TruncatedObject }
         ]);
     }
     create(value?: PartialMessage<ActorByFilterResult>): ActorByFilterResult {
         const message = globalThis.Object.create((this.messagePrototype!));
         message.Objects = [];
         message.queryContext = "";
+        message.TruncatedObjects = [];
         if (value !== undefined)
             reflectionMergePartial<ActorByFilterResult>(this, message, value);
         return message;
@@ -398,6 +442,9 @@ class ActorByFilterResult$Type extends MessageType<ActorByFilterResult> {
                 case /* string queryContext */ 3:
                     message.queryContext = reader.string();
                     break;
+                case /* repeated api.TruncatedObject TruncatedObjects */ 4:
+                    message.TruncatedObjects.push(TruncatedObject.internalBinaryRead(reader, reader.uint32(), options));
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -419,6 +466,9 @@ class ActorByFilterResult$Type extends MessageType<ActorByFilterResult> {
         /* string queryContext = 3; */
         if (message.queryContext !== "")
             writer.tag(3, WireType.LengthDelimited).string(message.queryContext);
+        /* repeated api.TruncatedObject TruncatedObjects = 4; */
+        for (let i = 0; i < message.TruncatedObjects.length; i++)
+            TruncatedObject.internalBinaryWrite(message.TruncatedObjects[i], writer.tag(4, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
diff --git a/appointmentQuery.ts b/appointmentQuery.ts
index 4e37ff5..9fc25fa 100644
--- a/appointmentQuery.ts
+++ b/appointmentQuery.ts
@@ -28,8 +28,10 @@ import { MatchFieldResult } from "./shared";
 import { MatchField } from "./shared";
 import { EntityType } from "./shared";
 import { BlockFilter } from "./shared";
+import { TruncatedObject } from "./shared";
 import { Appointment } from "./appointment";
 import { ResultHeader } from "./shared";
+import { QueryOptions } from "./shared";
 import { QueryEntityID } from "./shared";
 import { QueryProjectHeader } from "./shared";
 // 
@@ -48,9 +50,14 @@ export interface AppointmentByIdQuery {
      */
     IDs: QueryEntityID[];
     /**
-     * @generated from protobuf field: api.AppointmentQueryOptions Options = 3
+     * @deprecated
+     * @generated from protobuf field: api.AppointmentQueryOptions Options = 3 [deprecated = true]
      */
     Options?: AppointmentQueryOptions;
+    /**
+     * @generated from protobuf field: api.QueryOptions QueryOptions = 4
+     */
+    QueryOptions?: QueryOptions;
 }
 /**
  * @generated from protobuf message api.AppointmentByIdResult
@@ -64,6 +71,10 @@ export interface AppointmentByIdResult {
      * @generated from protobuf field: repeated api.Appointment Objects = 2
      */
     Objects: Appointment[];
+    /**
+     * @generated from protobuf field: repeated api.TruncatedObject TruncatedObjects = 3
+     */
+    TruncatedObjects: TruncatedObject[];
 }
 /**
  * @generated from protobuf message api.AppointmentByFilterQuery
@@ -90,7 +101,8 @@ export interface AppointmentByFilterQuery {
      */
     BlockFilters: BlockFilter[];
     /**
-     * @generated from protobuf field: api.AppointmentQueryOptions Options = 7
+     * @deprecated
+     * @generated from protobuf field: api.AppointmentQueryOptions Options = 7 [deprecated = true]
      */
     Options?: AppointmentQueryOptions;
     /**
@@ -101,6 +113,10 @@ export interface AppointmentByFilterQuery {
      * @generated from protobuf field: string UsageContextPath = 9
      */
     UsageContextPath: string;
+    /**
+     * @generated from protobuf field: api.QueryOptions QueryOptions = 10
+     */
+    QueryOptions?: QueryOptions;
 }
 /**
  * @generated from protobuf message api.AppointmentByFilterResult
@@ -118,6 +134,10 @@ export interface AppointmentByFilterResult {
      * @generated from protobuf field: string queryContext = 3
      */
     queryContext: string;
+    /**
+     * @generated from protobuf field: repeated api.TruncatedObject TruncatedObjects = 4
+     */
+    TruncatedObjects: TruncatedObject[];
 }
 /**
  * @generated from protobuf message api.AppointmentQueryOptions
@@ -189,7 +209,8 @@ class AppointmentByIdQuery$Type extends MessageType<AppointmentByIdQuery> {
         super("api.AppointmentByIdQuery", [
             { no: 1, name: "Header", kind: "message", localName: "Header", jsonName: "Header", T: () => QueryProjectHeader, options: { "n1validate.rules": { message: { required: true } } } },
             { no: 2, name: "IDs", kind: "message", localName: "IDs", jsonName: "IDs", repeat: 2 /*RepeatType.UNPACKED*/, T: () => QueryEntityID, options: { "n1validate.rules": { repeated: { minItems: "1" } } } },
-            { no: 3, name: "Options", kind: "message", localName: "Options", jsonName: "Options", T: () => AppointmentQueryOptions }
+            { no: 3, name: "Options", kind: "message", localName: "Options", jsonName: "Options", T: () => AppointmentQueryOptions },
+            { no: 4, name: "QueryOptions", kind: "message", localName: "QueryOptions", jsonName: "QueryOptions", T: () => QueryOptions }
         ], { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_schema": { jsonSchema: { required: ["Header", "IDs"] } }, "api.messageType": "Query" });
     }
     create(value?: PartialMessage<AppointmentByIdQuery>): AppointmentByIdQuery {
@@ -210,9 +231,12 @@ class AppointmentByIdQuery$Type extends MessageType<AppointmentByIdQuery> {
                 case /* repeated api.QueryEntityID IDs */ 2:
                     message.IDs.push(QueryEntityID.internalBinaryRead(reader, reader.uint32(), options));
                     break;
-                case /* api.AppointmentQueryOptions Options */ 3:
+                case /* api.AppointmentQueryOptions Options = 3 [deprecated = true] */ 3:
                     message.Options = AppointmentQueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.Options);
                     break;
+                case /* api.QueryOptions QueryOptions */ 4:
+                    message.QueryOptions = QueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.QueryOptions);
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -231,9 +255,12 @@ class AppointmentByIdQuery$Type extends MessageType<AppointmentByIdQuery> {
         /* repeated api.QueryEntityID IDs = 2; */
         for (let i = 0; i < message.IDs.length; i++)
             QueryEntityID.internalBinaryWrite(message.IDs[i], writer.tag(2, WireType.LengthDelimited).fork(), options).join();
-        /* api.AppointmentQueryOptions Options = 3; */
+        /* api.AppointmentQueryOptions Options = 3 [deprecated = true]; */
         if (message.Options)
             AppointmentQueryOptions.internalBinaryWrite(message.Options, writer.tag(3, WireType.LengthDelimited).fork(), options).join();
+        /* api.QueryOptions QueryOptions = 4; */
+        if (message.QueryOptions)
+            QueryOptions.internalBinaryWrite(message.QueryOptions, writer.tag(4, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
@@ -249,12 +276,14 @@ class AppointmentByIdResult$Type extends MessageType<AppointmentByIdResult> {
     constructor() {
         super("api.AppointmentByIdResult", [
             { no: 1, name: "Header", kind: "message", localName: "Header", jsonName: "Header", T: () => ResultHeader },
-            { no: 2, name: "Objects", kind: "message", localName: "Objects", jsonName: "Objects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => Appointment }
+            { no: 2, name: "Objects", kind: "message", localName: "Objects", jsonName: "Objects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => Appointment },
+            { no: 3, name: "TruncatedObjects", kind: "message", localName: "TruncatedObjects", jsonName: "TruncatedObjects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => TruncatedObject }
         ], { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_schema": { jsonSchema: {} }, "api.messageType": "Result" });
     }
     create(value?: PartialMessage<AppointmentByIdResult>): AppointmentByIdResult {
         const message = globalThis.Object.create((this.messagePrototype!));
         message.Objects = [];
+        message.TruncatedObjects = [];
         if (value !== undefined)
             reflectionMergePartial<AppointmentByIdResult>(this, message, value);
         return message;
@@ -270,6 +299,9 @@ class AppointmentByIdResult$Type extends MessageType<AppointmentByIdResult> {
                 case /* repeated api.Appointment Objects */ 2:
                     message.Objects.push(Appointment.internalBinaryRead(reader, reader.uint32(), options));
                     break;
+                case /* repeated api.TruncatedObject TruncatedObjects */ 3:
+                    message.TruncatedObjects.push(TruncatedObject.internalBinaryRead(reader, reader.uint32(), options));
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -288,6 +320,9 @@ class AppointmentByIdResult$Type extends MessageType<AppointmentByIdResult> {
         /* repeated api.Appointment Objects = 2; */
         for (let i = 0; i < message.Objects.length; i++)
             Appointment.internalBinaryWrite(message.Objects[i], writer.tag(2, WireType.LengthDelimited).fork(), options).join();
+        /* repeated api.TruncatedObject TruncatedObjects = 3; */
+        for (let i = 0; i < message.TruncatedObjects.length; i++)
+            TruncatedObject.internalBinaryWrite(message.TruncatedObjects[i], writer.tag(3, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
@@ -308,7 +343,8 @@ class AppointmentByFilterQuery$Type extends MessageType<AppointmentByFilterQuery
             { no: 6, name: "BlockFilters", kind: "message", localName: "BlockFilters", jsonName: "BlockFilters", repeat: 2 /*RepeatType.UNPACKED*/, T: () => BlockFilter },
             { no: 7, name: "Options", kind: "message", localName: "Options", jsonName: "Options", T: () => AppointmentQueryOptions },
             { no: 8, name: "UsageContextEntity", kind: "enum", localName: "UsageContextEntity", jsonName: "UsageContextEntity", T: () => ["api.EntityType", EntityType], options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Optional : Entity to apply the restriction rules (on the path defined with UsageContextPath)", example: "\"For Actor, to limit the results according to Order ShipFrom restriction rules, define UsageContextEntity to Order and UsageContextPath to Payload.ShipFrom\"" } } },
-            { no: 9, name: "UsageContextPath", kind: "scalar", localName: "UsageContextPath", jsonName: "UsageContextPath", T: 9 /*ScalarType.STRING*/, options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Optional : Path of restriction rule to apply (UsageContextEntity should be defined)" } } }
+            { no: 9, name: "UsageContextPath", kind: "scalar", localName: "UsageContextPath", jsonName: "UsageContextPath", T: 9 /*ScalarType.STRING*/, options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Optional : Path of restriction rule to apply (UsageContextEntity should be defined)" } } },
+            { no: 10, name: "QueryOptions", kind: "message", localName: "QueryOptions", jsonName: "QueryOptions", T: () => QueryOptions }
         ], { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_schema": { jsonSchema: { required: ["Header"] } } });
     }
     create(value?: PartialMessage<AppointmentByFilterQuery>): AppointmentByFilterQuery {
@@ -339,7 +375,7 @@ class AppointmentByFilterQuery$Type extends MessageType<AppointmentByFilterQuery
                 case /* repeated api.BlockFilter BlockFilters */ 6:
                     message.BlockFilters.push(BlockFilter.internalBinaryRead(reader, reader.uint32(), options));
                     break;
-                case /* api.AppointmentQueryOptions Options */ 7:
+                case /* api.AppointmentQueryOptions Options = 7 [deprecated = true] */ 7:
                     message.Options = AppointmentQueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.Options);
                     break;
                 case /* api.EntityType UsageContextEntity */ 8:
@@ -348,6 +384,9 @@ class AppointmentByFilterQuery$Type extends MessageType<AppointmentByFilterQuery
                 case /* string UsageContextPath */ 9:
                     message.UsageContextPath = reader.string();
                     break;
+                case /* api.QueryOptions QueryOptions */ 10:
+                    message.QueryOptions = QueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.QueryOptions);
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -372,7 +411,7 @@ class AppointmentByFilterQuery$Type extends MessageType<AppointmentByFilterQuery
         /* repeated api.BlockFilter BlockFilters = 6; */
         for (let i = 0; i < message.BlockFilters.length; i++)
             BlockFilter.internalBinaryWrite(message.BlockFilters[i], writer.tag(6, WireType.LengthDelimited).fork(), options).join();
-        /* api.AppointmentQueryOptions Options = 7; */
+        /* api.AppointmentQueryOptions Options = 7 [deprecated = true]; */
         if (message.Options)
             AppointmentQueryOptions.internalBinaryWrite(message.Options, writer.tag(7, WireType.LengthDelimited).fork(), options).join();
         /* api.EntityType UsageContextEntity = 8; */
@@ -381,6 +420,9 @@ class AppointmentByFilterQuery$Type extends MessageType<AppointmentByFilterQuery
         /* string UsageContextPath = 9; */
         if (message.UsageContextPath !== "")
             writer.tag(9, WireType.LengthDelimited).string(message.UsageContextPath);
+        /* api.QueryOptions QueryOptions = 10; */
+        if (message.QueryOptions)
+            QueryOptions.internalBinaryWrite(message.QueryOptions, writer.tag(10, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
@@ -397,13 +439,15 @@ class AppointmentByFilterResult$Type extends MessageType<AppointmentByFilterResu
         super("api.AppointmentByFilterResult", [
             { no: 1, name: "Header", kind: "message", localName: "Header", jsonName: "Header", T: () => ResultHeader },
             { no: 2, name: "Objects", kind: "message", localName: "Objects", jsonName: "Objects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => Appointment },
-            { no: 3, name: "queryContext", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
+            { no: 3, name: "queryContext", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
+            { no: 4, name: "TruncatedObjects", kind: "message", localName: "TruncatedObjects", jsonName: "TruncatedObjects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => TruncatedObject }
         ]);
     }
     create(value?: PartialMessage<AppointmentByFilterResult>): AppointmentByFilterResult {
         const message = globalThis.Object.create((this.messagePrototype!));
         message.Objects = [];
         message.queryContext = "";
+        message.TruncatedObjects = [];
         if (value !== undefined)
             reflectionMergePartial<AppointmentByFilterResult>(this, message, value);
         return message;
@@ -422,6 +466,9 @@ class AppointmentByFilterResult$Type extends MessageType<AppointmentByFilterResu
                 case /* string queryContext */ 3:
                     message.queryContext = reader.string();
                     break;
+                case /* repeated api.TruncatedObject TruncatedObjects */ 4:
+                    message.TruncatedObjects.push(TruncatedObject.internalBinaryRead(reader, reader.uint32(), options));
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -443,6 +490,9 @@ class AppointmentByFilterResult$Type extends MessageType<AppointmentByFilterResu
         /* string queryContext = 3; */
         if (message.queryContext !== "")
             writer.tag(3, WireType.LengthDelimited).string(message.queryContext);
+        /* repeated api.TruncatedObject TruncatedObjects = 4; */
+        for (let i = 0; i < message.TruncatedObjects.length; i++)
+            TruncatedObject.internalBinaryWrite(message.TruncatedObjects[i], writer.tag(4, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
diff --git a/claimQuery.ts b/claimQuery.ts
index 6c4a1fa..74d45e2 100644
--- a/claimQuery.ts
+++ b/claimQuery.ts
@@ -26,8 +26,10 @@ import { MatchFieldResult } from "./shared";
 import { MatchField } from "./shared";
 import { EntityType } from "./shared";
 import { BlockFilter } from "./shared";
+import { TruncatedObject } from "./shared";
 import { Claim } from "./claim";
 import { ResultHeader } from "./shared";
+import { QueryOptions } from "./shared";
 import { QueryEntityID } from "./shared";
 import { QueryProjectHeader } from "./shared";
 // 
@@ -46,9 +48,14 @@ export interface ClaimByIdQuery {
      */
     IDs: QueryEntityID[];
     /**
-     * @generated from protobuf field: api.ClaimQueryOptions Options = 3
+     * @deprecated
+     * @generated from protobuf field: api.ClaimQueryOptions Options = 3 [deprecated = true]
      */
     Options?: ClaimQueryOptions;
+    /**
+     * @generated from protobuf field: api.QueryOptions QueryOptions = 4
+     */
+    QueryOptions?: QueryOptions;
 }
 /**
  * @generated from protobuf message api.ClaimByIdResult
@@ -62,6 +69,10 @@ export interface ClaimByIdResult {
      * @generated from protobuf field: repeated api.Claim Objects = 2
      */
     Objects: Claim[];
+    /**
+     * @generated from protobuf field: repeated api.TruncatedObject TruncatedObjects = 3
+     */
+    TruncatedObjects: TruncatedObject[];
 }
 /**
  * @generated from protobuf message api.ClaimByFilterQuery
@@ -88,7 +99,8 @@ export interface ClaimByFilterQuery {
      */
     BlockFilters: BlockFilter[];
     /**
-     * @generated from protobuf field: api.ClaimQueryOptions Options = 7
+     * @deprecated
+     * @generated from protobuf field: api.ClaimQueryOptions Options = 7 [deprecated = true]
      */
     Options?: ClaimQueryOptions;
     /**
@@ -99,6 +111,10 @@ export interface ClaimByFilterQuery {
      * @generated from protobuf field: string UsageContextPath = 9
      */
     UsageContextPath: string;
+    /**
+     * @generated from protobuf field: api.QueryOptions QueryOptions = 10
+     */
+    QueryOptions?: QueryOptions;
 }
 /**
  * @generated from protobuf message api.ClaimByFilterResult
@@ -116,6 +132,10 @@ export interface ClaimByFilterResult {
      * @generated from protobuf field: string queryContext = 3
      */
     queryContext: string;
+    /**
+     * @generated from protobuf field: repeated api.TruncatedObject TruncatedObjects = 4
+     */
+    TruncatedObjects: TruncatedObject[];
 }
 /**
  * @generated from protobuf message api.ClaimQueryOptions
@@ -218,7 +238,8 @@ class ClaimByIdQuery$Type extends MessageType<ClaimByIdQuery> {
         super("api.ClaimByIdQuery", [
             { no: 1, name: "Header", kind: "message", localName: "Header", jsonName: "Header", T: () => QueryProjectHeader, options: { "n1validate.rules": { message: { required: true } } } },
             { no: 2, name: "IDs", kind: "message", localName: "IDs", jsonName: "IDs", repeat: 2 /*RepeatType.UNPACKED*/, T: () => QueryEntityID, options: { "n1validate.rules": { repeated: { minItems: "1" } } } },
-            { no: 3, name: "Options", kind: "message", localName: "Options", jsonName: "Options", T: () => ClaimQueryOptions }
+            { no: 3, name: "Options", kind: "message", localName: "Options", jsonName: "Options", T: () => ClaimQueryOptions },
+            { no: 4, name: "QueryOptions", kind: "message", localName: "QueryOptions", jsonName: "QueryOptions", T: () => QueryOptions }
         ], { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_schema": { jsonSchema: { required: ["Header", "IDs"] } }, "api.messageType": "Query" });
     }
     create(value?: PartialMessage<ClaimByIdQuery>): ClaimByIdQuery {
@@ -239,9 +260,12 @@ class ClaimByIdQuery$Type extends MessageType<ClaimByIdQuery> {
                 case /* repeated api.QueryEntityID IDs */ 2:
                     message.IDs.push(QueryEntityID.internalBinaryRead(reader, reader.uint32(), options));
                     break;
-                case /* api.ClaimQueryOptions Options */ 3:
+                case /* api.ClaimQueryOptions Options = 3 [deprecated = true] */ 3:
                     message.Options = ClaimQueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.Options);
                     break;
+                case /* api.QueryOptions QueryOptions */ 4:
+                    message.QueryOptions = QueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.QueryOptions);
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -260,9 +284,12 @@ class ClaimByIdQuery$Type extends MessageType<ClaimByIdQuery> {
         /* repeated api.QueryEntityID IDs = 2; */
         for (let i = 0; i < message.IDs.length; i++)
             QueryEntityID.internalBinaryWrite(message.IDs[i], writer.tag(2, WireType.LengthDelimited).fork(), options).join();
-        /* api.ClaimQueryOptions Options = 3; */
+        /* api.ClaimQueryOptions Options = 3 [deprecated = true]; */
         if (message.Options)
             ClaimQueryOptions.internalBinaryWrite(message.Options, writer.tag(3, WireType.LengthDelimited).fork(), options).join();
+        /* api.QueryOptions QueryOptions = 4; */
+        if (message.QueryOptions)
+            QueryOptions.internalBinaryWrite(message.QueryOptions, writer.tag(4, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
@@ -278,12 +305,14 @@ class ClaimByIdResult$Type extends MessageType<ClaimByIdResult> {
     constructor() {
         super("api.ClaimByIdResult", [
             { no: 1, name: "Header", kind: "message", localName: "Header", jsonName: "Header", T: () => ResultHeader },
-            { no: 2, name: "Objects", kind: "message", localName: "Objects", jsonName: "Objects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => Claim }
+            { no: 2, name: "Objects", kind: "message", localName: "Objects", jsonName: "Objects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => Claim },
+            { no: 3, name: "TruncatedObjects", kind: "message", localName: "TruncatedObjects", jsonName: "TruncatedObjects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => TruncatedObject }
         ], { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_schema": { jsonSchema: {} }, "api.messageType": "Result" });
     }
     create(value?: PartialMessage<ClaimByIdResult>): ClaimByIdResult {
         const message = globalThis.Object.create((this.messagePrototype!));
         message.Objects = [];
+        message.TruncatedObjects = [];
         if (value !== undefined)
             reflectionMergePartial<ClaimByIdResult>(this, message, value);
         return message;
@@ -299,6 +328,9 @@ class ClaimByIdResult$Type extends MessageType<ClaimByIdResult> {
                 case /* repeated api.Claim Objects */ 2:
                     message.Objects.push(Claim.internalBinaryRead(reader, reader.uint32(), options));
                     break;
+                case /* repeated api.TruncatedObject TruncatedObjects */ 3:
+                    message.TruncatedObjects.push(TruncatedObject.internalBinaryRead(reader, reader.uint32(), options));
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -317,6 +349,9 @@ class ClaimByIdResult$Type extends MessageType<ClaimByIdResult> {
         /* repeated api.Claim Objects = 2; */
         for (let i = 0; i < message.Objects.length; i++)
             Claim.internalBinaryWrite(message.Objects[i], writer.tag(2, WireType.LengthDelimited).fork(), options).join();
+        /* repeated api.TruncatedObject TruncatedObjects = 3; */
+        for (let i = 0; i < message.TruncatedObjects.length; i++)
+            TruncatedObject.internalBinaryWrite(message.TruncatedObjects[i], writer.tag(3, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
@@ -337,7 +372,8 @@ class ClaimByFilterQuery$Type extends MessageType<ClaimByFilterQuery> {
             { no: 6, name: "BlockFilters", kind: "message", localName: "BlockFilters", jsonName: "BlockFilters", repeat: 2 /*RepeatType.UNPACKED*/, T: () => BlockFilter },
             { no: 7, name: "Options", kind: "message", localName: "Options", jsonName: "Options", T: () => ClaimQueryOptions },
             { no: 8, name: "UsageContextEntity", kind: "enum", localName: "UsageContextEntity", jsonName: "UsageContextEntity", T: () => ["api.EntityType", EntityType], options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Optional : Entity to apply the restriction rules (on the path defined with UsageContextPath)", example: "\"For Actor, to limit the results according to Order ShipFrom restriction rules, define UsageContextEntity to Order and UsageContextPath to Payload.ShipFrom\"" } } },
-            { no: 9, name: "UsageContextPath", kind: "scalar", localName: "UsageContextPath", jsonName: "UsageContextPath", T: 9 /*ScalarType.STRING*/, options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Optional : Path of restriction rule to apply (UsageContextEntity should be defined)" } } }
+            { no: 9, name: "UsageContextPath", kind: "scalar", localName: "UsageContextPath", jsonName: "UsageContextPath", T: 9 /*ScalarType.STRING*/, options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Optional : Path of restriction rule to apply (UsageContextEntity should be defined)" } } },
+            { no: 10, name: "QueryOptions", kind: "message", localName: "QueryOptions", jsonName: "QueryOptions", T: () => QueryOptions }
         ], { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_schema": { jsonSchema: { required: ["Header"] } } });
     }
     create(value?: PartialMessage<ClaimByFilterQuery>): ClaimByFilterQuery {
@@ -368,7 +404,7 @@ class ClaimByFilterQuery$Type extends MessageType<ClaimByFilterQuery> {
                 case /* repeated api.BlockFilter BlockFilters */ 6:
                     message.BlockFilters.push(BlockFilter.internalBinaryRead(reader, reader.uint32(), options));
                     break;
-                case /* api.ClaimQueryOptions Options */ 7:
+                case /* api.ClaimQueryOptions Options = 7 [deprecated = true] */ 7:
                     message.Options = ClaimQueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.Options);
                     break;
                 case /* api.EntityType UsageContextEntity */ 8:
@@ -377,6 +413,9 @@ class ClaimByFilterQuery$Type extends MessageType<ClaimByFilterQuery> {
                 case /* string UsageContextPath */ 9:
                     message.UsageContextPath = reader.string();
                     break;
+                case /* api.QueryOptions QueryOptions */ 10:
+                    message.QueryOptions = QueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.QueryOptions);
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -401,7 +440,7 @@ class ClaimByFilterQuery$Type extends MessageType<ClaimByFilterQuery> {
         /* repeated api.BlockFilter BlockFilters = 6; */
         for (let i = 0; i < message.BlockFilters.length; i++)
             BlockFilter.internalBinaryWrite(message.BlockFilters[i], writer.tag(6, WireType.LengthDelimited).fork(), options).join();
-        /* api.ClaimQueryOptions Options = 7; */
+        /* api.ClaimQueryOptions Options = 7 [deprecated = true]; */
         if (message.Options)
             ClaimQueryOptions.internalBinaryWrite(message.Options, writer.tag(7, WireType.LengthDelimited).fork(), options).join();
         /* api.EntityType UsageContextEntity = 8; */
@@ -410,6 +449,9 @@ class ClaimByFilterQuery$Type extends MessageType<ClaimByFilterQuery> {
         /* string UsageContextPath = 9; */
         if (message.UsageContextPath !== "")
             writer.tag(9, WireType.LengthDelimited).string(message.UsageContextPath);
+        /* api.QueryOptions QueryOptions = 10; */
+        if (message.QueryOptions)
+            QueryOptions.internalBinaryWrite(message.QueryOptions, writer.tag(10, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
@@ -426,13 +468,15 @@ class ClaimByFilterResult$Type extends MessageType<ClaimByFilterResult> {
         super("api.ClaimByFilterResult", [
             { no: 1, name: "Header", kind: "message", localName: "Header", jsonName: "Header", T: () => ResultHeader },
             { no: 2, name: "Objects", kind: "message", localName: "Objects", jsonName: "Objects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => Claim },
-            { no: 3, name: "queryContext", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
+            { no: 3, name: "queryContext", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
+            { no: 4, name: "TruncatedObjects", kind: "message", localName: "TruncatedObjects", jsonName: "TruncatedObjects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => TruncatedObject }
         ]);
     }
     create(value?: PartialMessage<ClaimByFilterResult>): ClaimByFilterResult {
         const message = globalThis.Object.create((this.messagePrototype!));
         message.Objects = [];
         message.queryContext = "";
+        message.TruncatedObjects = [];
         if (value !== undefined)
             reflectionMergePartial<ClaimByFilterResult>(this, message, value);
         return message;
@@ -451,6 +495,9 @@ class ClaimByFilterResult$Type extends MessageType<ClaimByFilterResult> {
                 case /* string queryContext */ 3:
                     message.queryContext = reader.string();
                     break;
+                case /* repeated api.TruncatedObject TruncatedObjects */ 4:
+                    message.TruncatedObjects.push(TruncatedObject.internalBinaryRead(reader, reader.uint32(), options));
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -472,6 +519,9 @@ class ClaimByFilterResult$Type extends MessageType<ClaimByFilterResult> {
         /* string queryContext = 3; */
         if (message.queryContext !== "")
             writer.tag(3, WireType.LengthDelimited).string(message.queryContext);
+        /* repeated api.TruncatedObject TruncatedObjects = 4; */
+        for (let i = 0; i < message.TruncatedObjects.length; i++)
+            TruncatedObject.internalBinaryWrite(message.TruncatedObjects[i], writer.tag(4, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
diff --git a/executionflowQuery.ts b/executionflowQuery.ts
index 124ce8b..7fb3781 100644
--- a/executionflowQuery.ts
+++ b/executionflowQuery.ts
@@ -17,8 +17,10 @@ import { reflectionMergePartial } from "@protobuf-ts/runtime";
 import { MessageType } from "@protobuf-ts/runtime";
 import { EntityType } from "./shared";
 import { BlockFilter } from "./shared";
+import { TruncatedObject } from "./shared";
 import { Executionflow } from "./executionflow";
 import { ResultHeader } from "./shared";
+import { QueryOptions } from "./shared";
 import { QueryEntityID } from "./shared";
 import { QueryProjectHeader } from "./shared";
 // 
@@ -37,9 +39,14 @@ export interface ExecutionflowByIdQuery {
      */
     IDs: QueryEntityID[];
     /**
-     * @generated from protobuf field: api.ExecutionflowQueryOptions Options = 3
+     * @deprecated
+     * @generated from protobuf field: api.ExecutionflowQueryOptions Options = 3 [deprecated = true]
      */
     Options?: ExecutionflowQueryOptions;
+    /**
+     * @generated from protobuf field: api.QueryOptions QueryOptions = 4
+     */
+    QueryOptions?: QueryOptions;
 }
 /**
  * @generated from protobuf message api.ExecutionflowByIdResult
@@ -53,6 +60,10 @@ export interface ExecutionflowByIdResult {
      * @generated from protobuf field: repeated api.Executionflow Objects = 2
      */
     Objects: Executionflow[];
+    /**
+     * @generated from protobuf field: repeated api.TruncatedObject TruncatedObjects = 3
+     */
+    TruncatedObjects: TruncatedObject[];
 }
 /**
  * @generated from protobuf message api.ExecutionflowByFilterQuery
@@ -79,7 +90,8 @@ export interface ExecutionflowByFilterQuery {
      */
     BlockFilters: BlockFilter[];
     /**
-     * @generated from protobuf field: api.ExecutionflowQueryOptions Options = 7
+     * @deprecated
+     * @generated from protobuf field: api.ExecutionflowQueryOptions Options = 7 [deprecated = true]
      */
     Options?: ExecutionflowQueryOptions;
     /**
@@ -90,6 +102,10 @@ export interface ExecutionflowByFilterQuery {
      * @generated from protobuf field: string UsageContextPath = 9
      */
     UsageContextPath: string;
+    /**
+     * @generated from protobuf field: api.QueryOptions QueryOptions = 10
+     */
+    QueryOptions?: QueryOptions;
 }
 /**
  * @generated from protobuf message api.ExecutionflowByFilterResult
@@ -107,6 +123,10 @@ export interface ExecutionflowByFilterResult {
      * @generated from protobuf field: string queryContext = 3
      */
     queryContext: string;
+    /**
+     * @generated from protobuf field: repeated api.TruncatedObject TruncatedObjects = 4
+     */
+    TruncatedObjects: TruncatedObject[];
 }
 /**
  * @generated from protobuf message api.ExecutionflowQueryOptions
@@ -127,7 +147,8 @@ class ExecutionflowByIdQuery$Type extends MessageType<ExecutionflowByIdQuery> {
         super("api.ExecutionflowByIdQuery", [
             { no: 1, name: "Header", kind: "message", localName: "Header", jsonName: "Header", T: () => QueryProjectHeader, options: { "n1validate.rules": { message: { required: true } } } },
             { no: 2, name: "IDs", kind: "message", localName: "IDs", jsonName: "IDs", repeat: 2 /*RepeatType.UNPACKED*/, T: () => QueryEntityID, options: { "n1validate.rules": { repeated: { minItems: "1" } } } },
-            { no: 3, name: "Options", kind: "message", localName: "Options", jsonName: "Options", T: () => ExecutionflowQueryOptions }
+            { no: 3, name: "Options", kind: "message", localName: "Options", jsonName: "Options", T: () => ExecutionflowQueryOptions },
+            { no: 4, name: "QueryOptions", kind: "message", localName: "QueryOptions", jsonName: "QueryOptions", T: () => QueryOptions }
         ], { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_schema": { jsonSchema: { required: ["Header", "IDs"] } }, "api.messageType": "Query" });
     }
     create(value?: PartialMessage<ExecutionflowByIdQuery>): ExecutionflowByIdQuery {
@@ -148,9 +169,12 @@ class ExecutionflowByIdQuery$Type extends MessageType<ExecutionflowByIdQuery> {
                 case /* repeated api.QueryEntityID IDs */ 2:
                     message.IDs.push(QueryEntityID.internalBinaryRead(reader, reader.uint32(), options));
                     break;
-                case /* api.ExecutionflowQueryOptions Options */ 3:
+                case /* api.ExecutionflowQueryOptions Options = 3 [deprecated = true] */ 3:
                     message.Options = ExecutionflowQueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.Options);
                     break;
+                case /* api.QueryOptions QueryOptions */ 4:
+                    message.QueryOptions = QueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.QueryOptions);
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -169,9 +193,12 @@ class ExecutionflowByIdQuery$Type extends MessageType<ExecutionflowByIdQuery> {
         /* repeated api.QueryEntityID IDs = 2; */
         for (let i = 0; i < message.IDs.length; i++)
             QueryEntityID.internalBinaryWrite(message.IDs[i], writer.tag(2, WireType.LengthDelimited).fork(), options).join();
-        /* api.ExecutionflowQueryOptions Options = 3; */
+        /* api.ExecutionflowQueryOptions Options = 3 [deprecated = true]; */
         if (message.Options)
             ExecutionflowQueryOptions.internalBinaryWrite(message.Options, writer.tag(3, WireType.LengthDelimited).fork(), options).join();
+        /* api.QueryOptions QueryOptions = 4; */
+        if (message.QueryOptions)
+            QueryOptions.internalBinaryWrite(message.QueryOptions, writer.tag(4, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
@@ -187,12 +214,14 @@ class ExecutionflowByIdResult$Type extends MessageType<ExecutionflowByIdResult>
     constructor() {
         super("api.ExecutionflowByIdResult", [
             { no: 1, name: "Header", kind: "message", localName: "Header", jsonName: "Header", T: () => ResultHeader },
-            { no: 2, name: "Objects", kind: "message", localName: "Objects", jsonName: "Objects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => Executionflow }
+            { no: 2, name: "Objects", kind: "message", localName: "Objects", jsonName: "Objects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => Executionflow },
+            { no: 3, name: "TruncatedObjects", kind: "message", localName: "TruncatedObjects", jsonName: "TruncatedObjects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => TruncatedObject }
         ], { "api.messageType": "Result" });
     }
     create(value?: PartialMessage<ExecutionflowByIdResult>): ExecutionflowByIdResult {
         const message = globalThis.Object.create((this.messagePrototype!));
         message.Objects = [];
+        message.TruncatedObjects = [];
         if (value !== undefined)
             reflectionMergePartial<ExecutionflowByIdResult>(this, message, value);
         return message;
@@ -208,6 +237,9 @@ class ExecutionflowByIdResult$Type extends MessageType<ExecutionflowByIdResult>
                 case /* repeated api.Executionflow Objects */ 2:
                     message.Objects.push(Executionflow.internalBinaryRead(reader, reader.uint32(), options));
                     break;
+                case /* repeated api.TruncatedObject TruncatedObjects */ 3:
+                    message.TruncatedObjects.push(TruncatedObject.internalBinaryRead(reader, reader.uint32(), options));
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -226,6 +258,9 @@ class ExecutionflowByIdResult$Type extends MessageType<ExecutionflowByIdResult>
         /* repeated api.Executionflow Objects = 2; */
         for (let i = 0; i < message.Objects.length; i++)
             Executionflow.internalBinaryWrite(message.Objects[i], writer.tag(2, WireType.LengthDelimited).fork(), options).join();
+        /* repeated api.TruncatedObject TruncatedObjects = 3; */
+        for (let i = 0; i < message.TruncatedObjects.length; i++)
+            TruncatedObject.internalBinaryWrite(message.TruncatedObjects[i], writer.tag(3, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
@@ -246,7 +281,8 @@ class ExecutionflowByFilterQuery$Type extends MessageType<ExecutionflowByFilterQ
             { no: 6, name: "BlockFilters", kind: "message", localName: "BlockFilters", jsonName: "BlockFilters", repeat: 2 /*RepeatType.UNPACKED*/, T: () => BlockFilter },
             { no: 7, name: "Options", kind: "message", localName: "Options", jsonName: "Options", T: () => ExecutionflowQueryOptions },
             { no: 8, name: "UsageContextEntity", kind: "enum", localName: "UsageContextEntity", jsonName: "UsageContextEntity", T: () => ["api.EntityType", EntityType], options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Optional : Entity to apply the restriction rules (on the path defined with UsageContextPath)", example: "\"For Actor, to limit the results according to Order ShipFrom restriction rules, define UsageContextEntity to Order and UsageContextPath to Payload.ShipFrom\"" } } },
-            { no: 9, name: "UsageContextPath", kind: "scalar", localName: "UsageContextPath", jsonName: "UsageContextPath", T: 9 /*ScalarType.STRING*/, options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Optional : Path of restriction rule to apply (UsageContextEntity should be defined)" } } }
+            { no: 9, name: "UsageContextPath", kind: "scalar", localName: "UsageContextPath", jsonName: "UsageContextPath", T: 9 /*ScalarType.STRING*/, options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Optional : Path of restriction rule to apply (UsageContextEntity should be defined)" } } },
+            { no: 10, name: "QueryOptions", kind: "message", localName: "QueryOptions", jsonName: "QueryOptions", T: () => QueryOptions }
         ], { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_schema": { jsonSchema: { required: ["Header"] } } });
     }
     create(value?: PartialMessage<ExecutionflowByFilterQuery>): ExecutionflowByFilterQuery {
@@ -277,7 +313,7 @@ class ExecutionflowByFilterQuery$Type extends MessageType<ExecutionflowByFilterQ
                 case /* repeated api.BlockFilter BlockFilters */ 6:
                     message.BlockFilters.push(BlockFilter.internalBinaryRead(reader, reader.uint32(), options));
                     break;
-                case /* api.ExecutionflowQueryOptions Options */ 7:
+                case /* api.ExecutionflowQueryOptions Options = 7 [deprecated = true] */ 7:
                     message.Options = ExecutionflowQueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.Options);
                     break;
                 case /* api.EntityType UsageContextEntity */ 8:
@@ -286,6 +322,9 @@ class ExecutionflowByFilterQuery$Type extends MessageType<ExecutionflowByFilterQ
                 case /* string UsageContextPath */ 9:
                     message.UsageContextPath = reader.string();
                     break;
+                case /* api.QueryOptions QueryOptions */ 10:
+                    message.QueryOptions = QueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.QueryOptions);
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -310,7 +349,7 @@ class ExecutionflowByFilterQuery$Type extends MessageType<ExecutionflowByFilterQ
         /* repeated api.BlockFilter BlockFilters = 6; */
         for (let i = 0; i < message.BlockFilters.length; i++)
             BlockFilter.internalBinaryWrite(message.BlockFilters[i], writer.tag(6, WireType.LengthDelimited).fork(), options).join();
-        /* api.ExecutionflowQueryOptions Options = 7; */
+        /* api.ExecutionflowQueryOptions Options = 7 [deprecated = true]; */
         if (message.Options)
             ExecutionflowQueryOptions.internalBinaryWrite(message.Options, writer.tag(7, WireType.LengthDelimited).fork(), options).join();
         /* api.EntityType UsageContextEntity = 8; */
@@ -319,6 +358,9 @@ class ExecutionflowByFilterQuery$Type extends MessageType<ExecutionflowByFilterQ
         /* string UsageContextPath = 9; */
         if (message.UsageContextPath !== "")
             writer.tag(9, WireType.LengthDelimited).string(message.UsageContextPath);
+        /* api.QueryOptions QueryOptions = 10; */
+        if (message.QueryOptions)
+            QueryOptions.internalBinaryWrite(message.QueryOptions, writer.tag(10, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
@@ -335,13 +377,15 @@ class ExecutionflowByFilterResult$Type extends MessageType<ExecutionflowByFilter
         super("api.ExecutionflowByFilterResult", [
             { no: 1, name: "Header", kind: "message", localName: "Header", jsonName: "Header", T: () => ResultHeader },
             { no: 2, name: "Objects", kind: "message", localName: "Objects", jsonName: "Objects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => Executionflow },
-            { no: 3, name: "queryContext", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
+            { no: 3, name: "queryContext", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
+            { no: 4, name: "TruncatedObjects", kind: "message", localName: "TruncatedObjects", jsonName: "TruncatedObjects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => TruncatedObject }
         ]);
     }
     create(value?: PartialMessage<ExecutionflowByFilterResult>): ExecutionflowByFilterResult {
         const message = globalThis.Object.create((this.messagePrototype!));
         message.Objects = [];
         message.queryContext = "";
+        message.TruncatedObjects = [];
         if (value !== undefined)
             reflectionMergePartial<ExecutionflowByFilterResult>(this, message, value);
         return message;
@@ -360,6 +404,9 @@ class ExecutionflowByFilterResult$Type extends MessageType<ExecutionflowByFilter
                 case /* string queryContext */ 3:
                     message.queryContext = reader.string();
                     break;
+                case /* repeated api.TruncatedObject TruncatedObjects */ 4:
+                    message.TruncatedObjects.push(TruncatedObject.internalBinaryRead(reader, reader.uint32(), options));
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -381,6 +428,9 @@ class ExecutionflowByFilterResult$Type extends MessageType<ExecutionflowByFilter
         /* string queryContext = 3; */
         if (message.queryContext !== "")
             writer.tag(3, WireType.LengthDelimited).string(message.queryContext);
+        /* repeated api.TruncatedObject TruncatedObjects = 4; */
+        for (let i = 0; i < message.TruncatedObjects.length; i++)
+            TruncatedObject.internalBinaryWrite(message.TruncatedObjects[i], writer.tag(4, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
diff --git a/handlingunitQuery.ts b/handlingunitQuery.ts
index cb4f130..f03dc1c 100644
--- a/handlingunitQuery.ts
+++ b/handlingunitQuery.ts
@@ -23,8 +23,10 @@ import { MatchFieldResult } from "./shared";
 import { MatchField } from "./shared";
 import { EntityType } from "./shared";
 import { BlockFilter } from "./shared";
+import { TruncatedObject } from "./shared";
 import { Handlingunit } from "./handlingunit";
 import { ResultHeader } from "./shared";
+import { QueryOptions } from "./shared";
 import { QueryEntityID } from "./shared";
 import { QueryProjectHeader } from "./shared";
 // 
@@ -43,9 +45,14 @@ export interface HandlingunitByIdQuery {
      */
     IDs: QueryEntityID[];
     /**
-     * @generated from protobuf field: api.HandlingunitQueryOptions Options = 3
+     * @deprecated
+     * @generated from protobuf field: api.HandlingunitQueryOptions Options = 3 [deprecated = true]
      */
     Options?: HandlingunitQueryOptions;
+    /**
+     * @generated from protobuf field: api.QueryOptions QueryOptions = 4
+     */
+    QueryOptions?: QueryOptions;
 }
 /**
  * @generated from protobuf message api.HandlingunitByIdResult
@@ -59,6 +66,10 @@ export interface HandlingunitByIdResult {
      * @generated from protobuf field: repeated api.Handlingunit Objects = 2
      */
     Objects: Handlingunit[];
+    /**
+     * @generated from protobuf field: repeated api.TruncatedObject TruncatedObjects = 3
+     */
+    TruncatedObjects: TruncatedObject[];
 }
 /**
  * @generated from protobuf message api.HandlingunitByFilterQuery
@@ -83,7 +94,8 @@ export interface HandlingunitByFilterQuery {
      */
     BlockFilters: BlockFilter[];
     /**
-     * @generated from protobuf field: api.HandlingunitQueryOptions Options = 8
+     * @deprecated
+     * @generated from protobuf field: api.HandlingunitQueryOptions Options = 8 [deprecated = true]
      */
     Options?: HandlingunitQueryOptions;
     /**
@@ -94,6 +106,10 @@ export interface HandlingunitByFilterQuery {
      * @generated from protobuf field: string UsageContextPath = 10
      */
     UsageContextPath: string;
+    /**
+     * @generated from protobuf field: api.QueryOptions QueryOptions = 11
+     */
+    QueryOptions?: QueryOptions;
 }
 /**
  * @generated from protobuf message api.HandlingunitByFilterResult
@@ -111,6 +127,10 @@ export interface HandlingunitByFilterResult {
      * @generated from protobuf field: string queryContext = 3
      */
     queryContext: string;
+    /**
+     * @generated from protobuf field: repeated api.TruncatedObject TruncatedObjects = 4
+     */
+    TruncatedObjects: TruncatedObject[];
 }
 /**
  * @generated from protobuf message api.HandlingunitQueryOptions
@@ -165,7 +185,8 @@ class HandlingunitByIdQuery$Type extends MessageType<HandlingunitByIdQuery> {
         super("api.HandlingunitByIdQuery", [
             { no: 1, name: "Header", kind: "message", localName: "Header", jsonName: "Header", T: () => QueryProjectHeader, options: { "n1validate.rules": { message: { required: true } } } },
             { no: 2, name: "IDs", kind: "message", localName: "IDs", jsonName: "IDs", repeat: 2 /*RepeatType.UNPACKED*/, T: () => QueryEntityID, options: { "n1validate.rules": { repeated: { minItems: "1" } } } },
-            { no: 3, name: "Options", kind: "message", localName: "Options", jsonName: "Options", T: () => HandlingunitQueryOptions }
+            { no: 3, name: "Options", kind: "message", localName: "Options", jsonName: "Options", T: () => HandlingunitQueryOptions },
+            { no: 4, name: "QueryOptions", kind: "message", localName: "QueryOptions", jsonName: "QueryOptions", T: () => QueryOptions }
         ], { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_schema": { jsonSchema: { required: ["Header", "IDs"] } }, "api.messageType": "Query" });
     }
     create(value?: PartialMessage<HandlingunitByIdQuery>): HandlingunitByIdQuery {
@@ -186,9 +207,12 @@ class HandlingunitByIdQuery$Type extends MessageType<HandlingunitByIdQuery> {
                 case /* repeated api.QueryEntityID IDs */ 2:
                     message.IDs.push(QueryEntityID.internalBinaryRead(reader, reader.uint32(), options));
                     break;
-                case /* api.HandlingunitQueryOptions Options */ 3:
+                case /* api.HandlingunitQueryOptions Options = 3 [deprecated = true] */ 3:
                     message.Options = HandlingunitQueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.Options);
                     break;
+                case /* api.QueryOptions QueryOptions */ 4:
+                    message.QueryOptions = QueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.QueryOptions);
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -207,9 +231,12 @@ class HandlingunitByIdQuery$Type extends MessageType<HandlingunitByIdQuery> {
         /* repeated api.QueryEntityID IDs = 2; */
         for (let i = 0; i < message.IDs.length; i++)
             QueryEntityID.internalBinaryWrite(message.IDs[i], writer.tag(2, WireType.LengthDelimited).fork(), options).join();
-        /* api.HandlingunitQueryOptions Options = 3; */
+        /* api.HandlingunitQueryOptions Options = 3 [deprecated = true]; */
         if (message.Options)
             HandlingunitQueryOptions.internalBinaryWrite(message.Options, writer.tag(3, WireType.LengthDelimited).fork(), options).join();
+        /* api.QueryOptions QueryOptions = 4; */
+        if (message.QueryOptions)
+            QueryOptions.internalBinaryWrite(message.QueryOptions, writer.tag(4, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
@@ -225,12 +252,14 @@ class HandlingunitByIdResult$Type extends MessageType<HandlingunitByIdResult> {
     constructor() {
         super("api.HandlingunitByIdResult", [
             { no: 1, name: "Header", kind: "message", localName: "Header", jsonName: "Header", T: () => ResultHeader },
-            { no: 2, name: "Objects", kind: "message", localName: "Objects", jsonName: "Objects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => Handlingunit }
+            { no: 2, name: "Objects", kind: "message", localName: "Objects", jsonName: "Objects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => Handlingunit },
+            { no: 3, name: "TruncatedObjects", kind: "message", localName: "TruncatedObjects", jsonName: "TruncatedObjects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => TruncatedObject }
         ], { "api.messageType": "Result" });
     }
     create(value?: PartialMessage<HandlingunitByIdResult>): HandlingunitByIdResult {
         const message = globalThis.Object.create((this.messagePrototype!));
         message.Objects = [];
+        message.TruncatedObjects = [];
         if (value !== undefined)
             reflectionMergePartial<HandlingunitByIdResult>(this, message, value);
         return message;
@@ -246,6 +275,9 @@ class HandlingunitByIdResult$Type extends MessageType<HandlingunitByIdResult> {
                 case /* repeated api.Handlingunit Objects */ 2:
                     message.Objects.push(Handlingunit.internalBinaryRead(reader, reader.uint32(), options));
                     break;
+                case /* repeated api.TruncatedObject TruncatedObjects */ 3:
+                    message.TruncatedObjects.push(TruncatedObject.internalBinaryRead(reader, reader.uint32(), options));
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -264,6 +296,9 @@ class HandlingunitByIdResult$Type extends MessageType<HandlingunitByIdResult> {
         /* repeated api.Handlingunit Objects = 2; */
         for (let i = 0; i < message.Objects.length; i++)
             Handlingunit.internalBinaryWrite(message.Objects[i], writer.tag(2, WireType.LengthDelimited).fork(), options).join();
+        /* repeated api.TruncatedObject TruncatedObjects = 3; */
+        for (let i = 0; i < message.TruncatedObjects.length; i++)
+            TruncatedObject.internalBinaryWrite(message.TruncatedObjects[i], writer.tag(3, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
@@ -284,7 +319,8 @@ class HandlingunitByFilterQuery$Type extends MessageType<HandlingunitByFilterQue
             { no: 7, name: "BlockFilters", kind: "message", localName: "BlockFilters", jsonName: "BlockFilters", repeat: 2 /*RepeatType.UNPACKED*/, T: () => BlockFilter },
             { no: 8, name: "Options", kind: "message", localName: "Options", jsonName: "Options", T: () => HandlingunitQueryOptions },
             { no: 9, name: "UsageContextEntity", kind: "enum", localName: "UsageContextEntity", jsonName: "UsageContextEntity", T: () => ["api.EntityType", EntityType], options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Optional : Entity to apply the restriction rules (on the path defined with UsageContextPath)", example: "\"For Actor, to limit the results according to Order ShipFrom restriction rules, define UsageContextEntity to Order and UsageContextPath to Payload.ShipFrom\"" } } },
-            { no: 10, name: "UsageContextPath", kind: "scalar", localName: "UsageContextPath", jsonName: "UsageContextPath", T: 9 /*ScalarType.STRING*/, options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Optional : Path of restriction rule to apply (UsageContextEntity should be defined)" } } }
+            { no: 10, name: "UsageContextPath", kind: "scalar", localName: "UsageContextPath", jsonName: "UsageContextPath", T: 9 /*ScalarType.STRING*/, options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Optional : Path of restriction rule to apply (UsageContextEntity should be defined)" } } },
+            { no: 11, name: "QueryOptions", kind: "message", localName: "QueryOptions", jsonName: "QueryOptions", T: () => QueryOptions }
         ]);
     }
     create(value?: PartialMessage<HandlingunitByFilterQuery>): HandlingunitByFilterQuery {
@@ -315,7 +351,7 @@ class HandlingunitByFilterQuery$Type extends MessageType<HandlingunitByFilterQue
                 case /* repeated api.BlockFilter BlockFilters */ 7:
                     message.BlockFilters.push(BlockFilter.internalBinaryRead(reader, reader.uint32(), options));
                     break;
-                case /* api.HandlingunitQueryOptions Options */ 8:
+                case /* api.HandlingunitQueryOptions Options = 8 [deprecated = true] */ 8:
                     message.Options = HandlingunitQueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.Options);
                     break;
                 case /* api.EntityType UsageContextEntity */ 9:
@@ -324,6 +360,9 @@ class HandlingunitByFilterQuery$Type extends MessageType<HandlingunitByFilterQue
                 case /* string UsageContextPath */ 10:
                     message.UsageContextPath = reader.string();
                     break;
+                case /* api.QueryOptions QueryOptions */ 11:
+                    message.QueryOptions = QueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.QueryOptions);
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -348,7 +387,7 @@ class HandlingunitByFilterQuery$Type extends MessageType<HandlingunitByFilterQue
         /* repeated api.BlockFilter BlockFilters = 7; */
         for (let i = 0; i < message.BlockFilters.length; i++)
             BlockFilter.internalBinaryWrite(message.BlockFilters[i], writer.tag(7, WireType.LengthDelimited).fork(), options).join();
-        /* api.HandlingunitQueryOptions Options = 8; */
+        /* api.HandlingunitQueryOptions Options = 8 [deprecated = true]; */
         if (message.Options)
             HandlingunitQueryOptions.internalBinaryWrite(message.Options, writer.tag(8, WireType.LengthDelimited).fork(), options).join();
         /* api.EntityType UsageContextEntity = 9; */
@@ -357,6 +396,9 @@ class HandlingunitByFilterQuery$Type extends MessageType<HandlingunitByFilterQue
         /* string UsageContextPath = 10; */
         if (message.UsageContextPath !== "")
             writer.tag(10, WireType.LengthDelimited).string(message.UsageContextPath);
+        /* api.QueryOptions QueryOptions = 11; */
+        if (message.QueryOptions)
+            QueryOptions.internalBinaryWrite(message.QueryOptions, writer.tag(11, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
@@ -373,13 +415,15 @@ class HandlingunitByFilterResult$Type extends MessageType<HandlingunitByFilterRe
         super("api.HandlingunitByFilterResult", [
             { no: 1, name: "Header", kind: "message", localName: "Header", jsonName: "Header", T: () => ResultHeader },
             { no: 2, name: "Objects", kind: "message", localName: "Objects", jsonName: "Objects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => Handlingunit },
-            { no: 3, name: "queryContext", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
+            { no: 3, name: "queryContext", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
+            { no: 4, name: "TruncatedObjects", kind: "message", localName: "TruncatedObjects", jsonName: "TruncatedObjects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => TruncatedObject }
         ]);
     }
     create(value?: PartialMessage<HandlingunitByFilterResult>): HandlingunitByFilterResult {
         const message = globalThis.Object.create((this.messagePrototype!));
         message.Objects = [];
         message.queryContext = "";
+        message.TruncatedObjects = [];
         if (value !== undefined)
             reflectionMergePartial<HandlingunitByFilterResult>(this, message, value);
         return message;
@@ -398,6 +442,9 @@ class HandlingunitByFilterResult$Type extends MessageType<HandlingunitByFilterRe
                 case /* string queryContext */ 3:
                     message.queryContext = reader.string();
                     break;
+                case /* repeated api.TruncatedObject TruncatedObjects */ 4:
+                    message.TruncatedObjects.push(TruncatedObject.internalBinaryRead(reader, reader.uint32(), options));
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -419,6 +466,9 @@ class HandlingunitByFilterResult$Type extends MessageType<HandlingunitByFilterRe
         /* string queryContext = 3; */
         if (message.queryContext !== "")
             writer.tag(3, WireType.LengthDelimited).string(message.queryContext);
+        /* repeated api.TruncatedObject TruncatedObjects = 4; */
+        for (let i = 0; i < message.TruncatedObjects.length; i++)
+            TruncatedObject.internalBinaryWrite(message.TruncatedObjects[i], writer.tag(4, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
diff --git a/itemQuery.ts b/itemQuery.ts
index c4aa31c..c70c17f 100644
--- a/itemQuery.ts
+++ b/itemQuery.ts
@@ -22,8 +22,10 @@ import { MatchFieldResult } from "./shared";
 import { MatchField } from "./shared";
 import { EntityType } from "./shared";
 import { BlockFilter } from "./shared";
+import { TruncatedObject } from "./shared";
 import { Item } from "./item";
 import { ResultHeader } from "./shared";
+import { QueryOptions } from "./shared";
 import { QueryEntityID } from "./shared";
 import { QueryProjectHeader } from "./shared";
 // 
@@ -42,9 +44,14 @@ export interface ItemByIdQuery {
      */
     IDs: QueryEntityID[];
     /**
-     * @generated from protobuf field: api.ItemQueryOptions Options = 3
+     * @deprecated
+     * @generated from protobuf field: api.ItemQueryOptions Options = 3 [deprecated = true]
      */
     Options?: ItemQueryOptions;
+    /**
+     * @generated from protobuf field: api.QueryOptions QueryOptions = 4
+     */
+    QueryOptions?: QueryOptions;
 }
 /**
  * @generated from protobuf message api.ItemByIdResult
@@ -60,6 +67,10 @@ export interface ItemByIdResult {
      * @generated from protobuf field: repeated api.Item Objects = 2
      */
     Objects: Item[];
+    /**
+     * @generated from protobuf field: repeated api.TruncatedObject TruncatedObjects = 3
+     */
+    TruncatedObjects: TruncatedObject[];
 }
 /**
  * @generated from protobuf message api.ItemByFilterQuery
@@ -86,7 +97,8 @@ export interface ItemByFilterQuery {
      */
     BlockFilters: BlockFilter[];
     /**
-     * @generated from protobuf field: api.ItemQueryOptions Options = 7
+     * @deprecated
+     * @generated from protobuf field: api.ItemQueryOptions Options = 7 [deprecated = true]
      */
     Options?: ItemQueryOptions;
     /**
@@ -97,6 +109,10 @@ export interface ItemByFilterQuery {
      * @generated from protobuf field: string UsageContextPath = 9
      */
     UsageContextPath: string;
+    /**
+     * @generated from protobuf field: api.QueryOptions QueryOptions = 10
+     */
+    QueryOptions?: QueryOptions;
 }
 /**
  * @generated from protobuf message api.ItemByFilterResult
@@ -114,6 +130,10 @@ export interface ItemByFilterResult {
      * @generated from protobuf field: string queryContext = 3
      */
     queryContext: string;
+    /**
+     * @generated from protobuf field: repeated api.TruncatedObject TruncatedObjects = 4
+     */
+    TruncatedObjects: TruncatedObject[];
 }
 /**
  * @generated from protobuf message api.ItemQueryOptions
@@ -202,7 +222,8 @@ class ItemByIdQuery$Type extends MessageType<ItemByIdQuery> {
         super("api.ItemByIdQuery", [
             { no: 1, name: "Header", kind: "message", localName: "Header", jsonName: "Header", T: () => QueryProjectHeader, options: { "n1validate.rules": { message: { required: true } } } },
             { no: 2, name: "IDs", kind: "message", localName: "IDs", jsonName: "IDs", repeat: 2 /*RepeatType.UNPACKED*/, T: () => QueryEntityID, options: { "n1validate.rules": { repeated: { minItems: "1" } } } },
-            { no: 3, name: "Options", kind: "message", localName: "Options", jsonName: "Options", T: () => ItemQueryOptions }
+            { no: 3, name: "Options", kind: "message", localName: "Options", jsonName: "Options", T: () => ItemQueryOptions },
+            { no: 4, name: "QueryOptions", kind: "message", localName: "QueryOptions", jsonName: "QueryOptions", T: () => QueryOptions }
         ], { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_schema": { jsonSchema: { required: ["Header", "IDs"] } }, "api.messageType": "Query" });
     }
     create(value?: PartialMessage<ItemByIdQuery>): ItemByIdQuery {
@@ -223,9 +244,12 @@ class ItemByIdQuery$Type extends MessageType<ItemByIdQuery> {
                 case /* repeated api.QueryEntityID IDs */ 2:
                     message.IDs.push(QueryEntityID.internalBinaryRead(reader, reader.uint32(), options));
                     break;
-                case /* api.ItemQueryOptions Options */ 3:
+                case /* api.ItemQueryOptions Options = 3 [deprecated = true] */ 3:
                     message.Options = ItemQueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.Options);
                     break;
+                case /* api.QueryOptions QueryOptions */ 4:
+                    message.QueryOptions = QueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.QueryOptions);
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -244,9 +268,12 @@ class ItemByIdQuery$Type extends MessageType<ItemByIdQuery> {
         /* repeated api.QueryEntityID IDs = 2; */
         for (let i = 0; i < message.IDs.length; i++)
             QueryEntityID.internalBinaryWrite(message.IDs[i], writer.tag(2, WireType.LengthDelimited).fork(), options).join();
-        /* api.ItemQueryOptions Options = 3; */
+        /* api.ItemQueryOptions Options = 3 [deprecated = true]; */
         if (message.Options)
             ItemQueryOptions.internalBinaryWrite(message.Options, writer.tag(3, WireType.LengthDelimited).fork(), options).join();
+        /* api.QueryOptions QueryOptions = 4; */
+        if (message.QueryOptions)
+            QueryOptions.internalBinaryWrite(message.QueryOptions, writer.tag(4, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
@@ -262,12 +289,14 @@ class ItemByIdResult$Type extends MessageType<ItemByIdResult> {
     constructor() {
         super("api.ItemByIdResult", [
             { no: 1, name: "Header", kind: "message", localName: "Header", jsonName: "Header", T: () => ResultHeader },
-            { no: 2, name: "Objects", kind: "message", localName: "Objects", jsonName: "Objects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => Item, options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Aggregation object message" } } }
+            { no: 2, name: "Objects", kind: "message", localName: "Objects", jsonName: "Objects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => Item, options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Aggregation object message" } } },
+            { no: 3, name: "TruncatedObjects", kind: "message", localName: "TruncatedObjects", jsonName: "TruncatedObjects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => TruncatedObject }
         ], { "api.messageType": "Result" });
     }
     create(value?: PartialMessage<ItemByIdResult>): ItemByIdResult {
         const message = globalThis.Object.create((this.messagePrototype!));
         message.Objects = [];
+        message.TruncatedObjects = [];
         if (value !== undefined)
             reflectionMergePartial<ItemByIdResult>(this, message, value);
         return message;
@@ -283,6 +312,9 @@ class ItemByIdResult$Type extends MessageType<ItemByIdResult> {
                 case /* repeated api.Item Objects */ 2:
                     message.Objects.push(Item.internalBinaryRead(reader, reader.uint32(), options));
                     break;
+                case /* repeated api.TruncatedObject TruncatedObjects */ 3:
+                    message.TruncatedObjects.push(TruncatedObject.internalBinaryRead(reader, reader.uint32(), options));
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -301,6 +333,9 @@ class ItemByIdResult$Type extends MessageType<ItemByIdResult> {
         /* repeated api.Item Objects = 2; */
         for (let i = 0; i < message.Objects.length; i++)
             Item.internalBinaryWrite(message.Objects[i], writer.tag(2, WireType.LengthDelimited).fork(), options).join();
+        /* repeated api.TruncatedObject TruncatedObjects = 3; */
+        for (let i = 0; i < message.TruncatedObjects.length; i++)
+            TruncatedObject.internalBinaryWrite(message.TruncatedObjects[i], writer.tag(3, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
@@ -321,7 +356,8 @@ class ItemByFilterQuery$Type extends MessageType<ItemByFilterQuery> {
             { no: 6, name: "BlockFilters", kind: "message", localName: "BlockFilters", jsonName: "BlockFilters", repeat: 2 /*RepeatType.UNPACKED*/, T: () => BlockFilter },
             { no: 7, name: "Options", kind: "message", localName: "Options", jsonName: "Options", T: () => ItemQueryOptions },
             { no: 8, name: "UsageContextEntity", kind: "enum", localName: "UsageContextEntity", jsonName: "UsageContextEntity", T: () => ["api.EntityType", EntityType], options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Optional : Entity to apply the restriction rules (on the path defined with UsageContextPath)", example: "\"For Actor, to limit the results according to Order ShipFrom restriction rules, define UsageContextEntity to Order and UsageContextPath to Payload.ShipFrom\"" } } },
-            { no: 9, name: "UsageContextPath", kind: "scalar", localName: "UsageContextPath", jsonName: "UsageContextPath", T: 9 /*ScalarType.STRING*/, options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Optional : Path of restriction rule to apply (UsageContextEntity should be defined)" } } }
+            { no: 9, name: "UsageContextPath", kind: "scalar", localName: "UsageContextPath", jsonName: "UsageContextPath", T: 9 /*ScalarType.STRING*/, options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Optional : Path of restriction rule to apply (UsageContextEntity should be defined)" } } },
+            { no: 10, name: "QueryOptions", kind: "message", localName: "QueryOptions", jsonName: "QueryOptions", T: () => QueryOptions }
         ], { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_schema": { jsonSchema: { required: ["Header"] } } });
     }
     create(value?: PartialMessage<ItemByFilterQuery>): ItemByFilterQuery {
@@ -352,7 +388,7 @@ class ItemByFilterQuery$Type extends MessageType<ItemByFilterQuery> {
                 case /* repeated api.BlockFilter BlockFilters */ 6:
                     message.BlockFilters.push(BlockFilter.internalBinaryRead(reader, reader.uint32(), options));
                     break;
-                case /* api.ItemQueryOptions Options */ 7:
+                case /* api.ItemQueryOptions Options = 7 [deprecated = true] */ 7:
                     message.Options = ItemQueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.Options);
                     break;
                 case /* api.EntityType UsageContextEntity */ 8:
@@ -361,6 +397,9 @@ class ItemByFilterQuery$Type extends MessageType<ItemByFilterQuery> {
                 case /* string UsageContextPath */ 9:
                     message.UsageContextPath = reader.string();
                     break;
+                case /* api.QueryOptions QueryOptions */ 10:
+                    message.QueryOptions = QueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.QueryOptions);
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -385,7 +424,7 @@ class ItemByFilterQuery$Type extends MessageType<ItemByFilterQuery> {
         /* repeated api.BlockFilter BlockFilters = 6; */
         for (let i = 0; i < message.BlockFilters.length; i++)
             BlockFilter.internalBinaryWrite(message.BlockFilters[i], writer.tag(6, WireType.LengthDelimited).fork(), options).join();
-        /* api.ItemQueryOptions Options = 7; */
+        /* api.ItemQueryOptions Options = 7 [deprecated = true]; */
         if (message.Options)
             ItemQueryOptions.internalBinaryWrite(message.Options, writer.tag(7, WireType.LengthDelimited).fork(), options).join();
         /* api.EntityType UsageContextEntity = 8; */
@@ -394,6 +433,9 @@ class ItemByFilterQuery$Type extends MessageType<ItemByFilterQuery> {
         /* string UsageContextPath = 9; */
         if (message.UsageContextPath !== "")
             writer.tag(9, WireType.LengthDelimited).string(message.UsageContextPath);
+        /* api.QueryOptions QueryOptions = 10; */
+        if (message.QueryOptions)
+            QueryOptions.internalBinaryWrite(message.QueryOptions, writer.tag(10, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
@@ -410,13 +452,15 @@ class ItemByFilterResult$Type extends MessageType<ItemByFilterResult> {
         super("api.ItemByFilterResult", [
             { no: 1, name: "Header", kind: "message", localName: "Header", jsonName: "Header", T: () => ResultHeader },
             { no: 2, name: "Objects", kind: "message", localName: "Objects", jsonName: "Objects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => Item },
-            { no: 3, name: "queryContext", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
+            { no: 3, name: "queryContext", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
+            { no: 4, name: "TruncatedObjects", kind: "message", localName: "TruncatedObjects", jsonName: "TruncatedObjects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => TruncatedObject }
         ]);
     }
     create(value?: PartialMessage<ItemByFilterResult>): ItemByFilterResult {
         const message = globalThis.Object.create((this.messagePrototype!));
         message.Objects = [];
         message.queryContext = "";
+        message.TruncatedObjects = [];
         if (value !== undefined)
             reflectionMergePartial<ItemByFilterResult>(this, message, value);
         return message;
@@ -435,6 +479,9 @@ class ItemByFilterResult$Type extends MessageType<ItemByFilterResult> {
                 case /* string queryContext */ 3:
                     message.queryContext = reader.string();
                     break;
+                case /* repeated api.TruncatedObject TruncatedObjects */ 4:
+                    message.TruncatedObjects.push(TruncatedObject.internalBinaryRead(reader, reader.uint32(), options));
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -456,6 +503,9 @@ class ItemByFilterResult$Type extends MessageType<ItemByFilterResult> {
         /* string queryContext = 3; */
         if (message.queryContext !== "")
             writer.tag(3, WireType.LengthDelimited).string(message.queryContext);
+        /* repeated api.TruncatedObject TruncatedObjects = 4; */
+        for (let i = 0; i < message.TruncatedObjects.length; i++)
+            TruncatedObject.internalBinaryWrite(message.TruncatedObjects[i], writer.tag(4, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
diff --git a/movementQuery.ts b/movementQuery.ts
index 1c69735..b7f2759 100644
--- a/movementQuery.ts
+++ b/movementQuery.ts
@@ -23,8 +23,10 @@ import { MatchFieldResult } from "./shared";
 import { MatchField } from "./shared";
 import { EntityType } from "./shared";
 import { BlockFilter } from "./shared";
+import { TruncatedObject } from "./shared";
 import { Movement } from "./movement";
 import { ResultHeader } from "./shared";
+import { QueryOptions } from "./shared";
 import { QueryEntityID } from "./shared";
 import { QueryProjectHeader } from "./shared";
 // 
@@ -43,9 +45,14 @@ export interface MovementByIdQuery {
      */
     IDs: QueryEntityID[];
     /**
-     * @generated from protobuf field: api.MovementQueryOptions Options = 3
+     * @deprecated
+     * @generated from protobuf field: api.MovementQueryOptions Options = 3 [deprecated = true]
      */
     Options?: MovementQueryOptions;
+    /**
+     * @generated from protobuf field: api.QueryOptions QueryOptions = 4
+     */
+    QueryOptions?: QueryOptions;
 }
 /**
  * @generated from protobuf message api.MovementByIdResult
@@ -59,6 +66,10 @@ export interface MovementByIdResult {
      * @generated from protobuf field: repeated api.Movement Objects = 2
      */
     Objects: Movement[];
+    /**
+     * @generated from protobuf field: repeated api.TruncatedObject TruncatedObjects = 4
+     */
+    TruncatedObjects: TruncatedObject[];
 }
 /**
  * @generated from protobuf message api.MovementByFilterQuery
@@ -85,7 +96,8 @@ export interface MovementByFilterQuery {
      */
     BlockFilters: BlockFilter[];
     /**
-     * @generated from protobuf field: api.MovementQueryOptions Options = 8
+     * @deprecated
+     * @generated from protobuf field: api.MovementQueryOptions Options = 8 [deprecated = true]
      */
     Options?: MovementQueryOptions;
     /**
@@ -96,6 +108,10 @@ export interface MovementByFilterQuery {
      * @generated from protobuf field: string UsageContextPath = 10
      */
     UsageContextPath: string;
+    /**
+     * @generated from protobuf field: api.QueryOptions QueryOptions = 11
+     */
+    QueryOptions?: QueryOptions;
 }
 /**
  * @generated from protobuf message api.MovementByFilterResult
@@ -113,6 +129,10 @@ export interface MovementByFilterResult {
      * @generated from protobuf field: string queryContext = 3
      */
     queryContext: string;
+    /**
+     * @generated from protobuf field: repeated api.TruncatedObject TruncatedObjects = 4
+     */
+    TruncatedObjects: TruncatedObject[];
 }
 /**
  * @generated from protobuf message api.MovementQueryOptions
@@ -174,9 +194,14 @@ export interface MovementByOperationReferenceQuery {
      */
     OperationReferences: string[];
     /**
-     * @generated from protobuf field: api.MovementQueryOptions Options = 3
+     * @deprecated
+     * @generated from protobuf field: api.MovementQueryOptions Options = 3 [deprecated = true]
      */
     Options?: MovementQueryOptions;
+    /**
+     * @generated from protobuf field: api.QueryOptions QueryOptions = 4
+     */
+    QueryOptions?: QueryOptions;
 }
 /**
  * @generated from protobuf message api.MovementByOperationReferenceResult
@@ -190,6 +215,10 @@ export interface MovementByOperationReferenceResult {
      * @generated from protobuf field: repeated api.Movement Objects = 2
      */
     Objects: Movement[];
+    /**
+     * @generated from protobuf field: repeated api.TruncatedObject TruncatedObjects = 3
+     */
+    TruncatedObjects: TruncatedObject[];
 }
 // @generated message type with reflection information, may provide speed optimized methods
 class MovementByIdQuery$Type extends MessageType<MovementByIdQuery> {
@@ -197,7 +226,8 @@ class MovementByIdQuery$Type extends MessageType<MovementByIdQuery> {
         super("api.MovementByIdQuery", [
             { no: 1, name: "Header", kind: "message", localName: "Header", jsonName: "Header", T: () => QueryProjectHeader, options: { "n1validate.rules": { message: { required: true } } } },
             { no: 2, name: "IDs", kind: "message", localName: "IDs", jsonName: "IDs", repeat: 2 /*RepeatType.UNPACKED*/, T: () => QueryEntityID, options: { "n1validate.rules": { repeated: { minItems: "1" } } } },
-            { no: 3, name: "Options", kind: "message", localName: "Options", jsonName: "Options", T: () => MovementQueryOptions }
+            { no: 3, name: "Options", kind: "message", localName: "Options", jsonName: "Options", T: () => MovementQueryOptions },
+            { no: 4, name: "QueryOptions", kind: "message", localName: "QueryOptions", jsonName: "QueryOptions", T: () => QueryOptions }
         ], { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_schema": { jsonSchema: { required: ["Header", "IDs"] } }, "api.messageType": "Query" });
     }
     create(value?: PartialMessage<MovementByIdQuery>): MovementByIdQuery {
@@ -218,9 +248,12 @@ class MovementByIdQuery$Type extends MessageType<MovementByIdQuery> {
                 case /* repeated api.QueryEntityID IDs */ 2:
                     message.IDs.push(QueryEntityID.internalBinaryRead(reader, reader.uint32(), options));
                     break;
-                case /* api.MovementQueryOptions Options */ 3:
+                case /* api.MovementQueryOptions Options = 3 [deprecated = true] */ 3:
                     message.Options = MovementQueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.Options);
                     break;
+                case /* api.QueryOptions QueryOptions */ 4:
+                    message.QueryOptions = QueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.QueryOptions);
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -239,9 +272,12 @@ class MovementByIdQuery$Type extends MessageType<MovementByIdQuery> {
         /* repeated api.QueryEntityID IDs = 2; */
         for (let i = 0; i < message.IDs.length; i++)
             QueryEntityID.internalBinaryWrite(message.IDs[i], writer.tag(2, WireType.LengthDelimited).fork(), options).join();
-        /* api.MovementQueryOptions Options = 3; */
+        /* api.MovementQueryOptions Options = 3 [deprecated = true]; */
         if (message.Options)
             MovementQueryOptions.internalBinaryWrite(message.Options, writer.tag(3, WireType.LengthDelimited).fork(), options).join();
+        /* api.QueryOptions QueryOptions = 4; */
+        if (message.QueryOptions)
+            QueryOptions.internalBinaryWrite(message.QueryOptions, writer.tag(4, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
@@ -257,12 +293,14 @@ class MovementByIdResult$Type extends MessageType<MovementByIdResult> {
     constructor() {
         super("api.MovementByIdResult", [
             { no: 1, name: "Header", kind: "message", localName: "Header", jsonName: "Header", T: () => ResultHeader },
-            { no: 2, name: "Objects", kind: "message", localName: "Objects", jsonName: "Objects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => Movement }
+            { no: 2, name: "Objects", kind: "message", localName: "Objects", jsonName: "Objects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => Movement },
+            { no: 4, name: "TruncatedObjects", kind: "message", localName: "TruncatedObjects", jsonName: "TruncatedObjects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => TruncatedObject }
         ], { "api.messageType": "Result" });
     }
     create(value?: PartialMessage<MovementByIdResult>): MovementByIdResult {
         const message = globalThis.Object.create((this.messagePrototype!));
         message.Objects = [];
+        message.TruncatedObjects = [];
         if (value !== undefined)
             reflectionMergePartial<MovementByIdResult>(this, message, value);
         return message;
@@ -278,6 +316,9 @@ class MovementByIdResult$Type extends MessageType<MovementByIdResult> {
                 case /* repeated api.Movement Objects */ 2:
                     message.Objects.push(Movement.internalBinaryRead(reader, reader.uint32(), options));
                     break;
+                case /* repeated api.TruncatedObject TruncatedObjects */ 4:
+                    message.TruncatedObjects.push(TruncatedObject.internalBinaryRead(reader, reader.uint32(), options));
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -296,6 +337,9 @@ class MovementByIdResult$Type extends MessageType<MovementByIdResult> {
         /* repeated api.Movement Objects = 2; */
         for (let i = 0; i < message.Objects.length; i++)
             Movement.internalBinaryWrite(message.Objects[i], writer.tag(2, WireType.LengthDelimited).fork(), options).join();
+        /* repeated api.TruncatedObject TruncatedObjects = 4; */
+        for (let i = 0; i < message.TruncatedObjects.length; i++)
+            TruncatedObject.internalBinaryWrite(message.TruncatedObjects[i], writer.tag(4, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
@@ -316,7 +360,8 @@ class MovementByFilterQuery$Type extends MessageType<MovementByFilterQuery> {
             { no: 7, name: "BlockFilters", kind: "message", localName: "BlockFilters", jsonName: "BlockFilters", repeat: 2 /*RepeatType.UNPACKED*/, T: () => BlockFilter },
             { no: 8, name: "Options", kind: "message", localName: "Options", jsonName: "Options", T: () => MovementQueryOptions },
             { no: 9, name: "UsageContextEntity", kind: "enum", localName: "UsageContextEntity", jsonName: "UsageContextEntity", T: () => ["api.EntityType", EntityType], options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Optional : Entity to apply the restriction rules (on the path defined with UsageContextPath)", example: "\"For Actor, to limit the results according to Order ShipFrom restriction rules, define UsageContextEntity to Order and UsageContextPath to Payload.ShipFrom\"" } } },
-            { no: 10, name: "UsageContextPath", kind: "scalar", localName: "UsageContextPath", jsonName: "UsageContextPath", T: 9 /*ScalarType.STRING*/, options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Optional : Path of restriction rule to apply (UsageContextEntity should be defined)" } } }
+            { no: 10, name: "UsageContextPath", kind: "scalar", localName: "UsageContextPath", jsonName: "UsageContextPath", T: 9 /*ScalarType.STRING*/, options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Optional : Path of restriction rule to apply (UsageContextEntity should be defined)" } } },
+            { no: 11, name: "QueryOptions", kind: "message", localName: "QueryOptions", jsonName: "QueryOptions", T: () => QueryOptions }
         ], { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_schema": { jsonSchema: { required: ["Header"] } } });
     }
     create(value?: PartialMessage<MovementByFilterQuery>): MovementByFilterQuery {
@@ -347,7 +392,7 @@ class MovementByFilterQuery$Type extends MessageType<MovementByFilterQuery> {
                 case /* repeated api.BlockFilter BlockFilters */ 7:
                     message.BlockFilters.push(BlockFilter.internalBinaryRead(reader, reader.uint32(), options));
                     break;
-                case /* api.MovementQueryOptions Options */ 8:
+                case /* api.MovementQueryOptions Options = 8 [deprecated = true] */ 8:
                     message.Options = MovementQueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.Options);
                     break;
                 case /* api.EntityType UsageContextEntity */ 9:
@@ -356,6 +401,9 @@ class MovementByFilterQuery$Type extends MessageType<MovementByFilterQuery> {
                 case /* string UsageContextPath */ 10:
                     message.UsageContextPath = reader.string();
                     break;
+                case /* api.QueryOptions QueryOptions */ 11:
+                    message.QueryOptions = QueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.QueryOptions);
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -380,7 +428,7 @@ class MovementByFilterQuery$Type extends MessageType<MovementByFilterQuery> {
         /* repeated api.BlockFilter BlockFilters = 7; */
         for (let i = 0; i < message.BlockFilters.length; i++)
             BlockFilter.internalBinaryWrite(message.BlockFilters[i], writer.tag(7, WireType.LengthDelimited).fork(), options).join();
-        /* api.MovementQueryOptions Options = 8; */
+        /* api.MovementQueryOptions Options = 8 [deprecated = true]; */
         if (message.Options)
             MovementQueryOptions.internalBinaryWrite(message.Options, writer.tag(8, WireType.LengthDelimited).fork(), options).join();
         /* api.EntityType UsageContextEntity = 9; */
@@ -389,6 +437,9 @@ class MovementByFilterQuery$Type extends MessageType<MovementByFilterQuery> {
         /* string UsageContextPath = 10; */
         if (message.UsageContextPath !== "")
             writer.tag(10, WireType.LengthDelimited).string(message.UsageContextPath);
+        /* api.QueryOptions QueryOptions = 11; */
+        if (message.QueryOptions)
+            QueryOptions.internalBinaryWrite(message.QueryOptions, writer.tag(11, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
@@ -405,13 +456,15 @@ class MovementByFilterResult$Type extends MessageType<MovementByFilterResult> {
         super("api.MovementByFilterResult", [
             { no: 1, name: "Header", kind: "message", localName: "Header", jsonName: "Header", T: () => ResultHeader },
             { no: 2, name: "Objects", kind: "message", localName: "Objects", jsonName: "Objects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => Movement },
-            { no: 3, name: "queryContext", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
+            { no: 3, name: "queryContext", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
+            { no: 4, name: "TruncatedObjects", kind: "message", localName: "TruncatedObjects", jsonName: "TruncatedObjects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => TruncatedObject }
         ]);
     }
     create(value?: PartialMessage<MovementByFilterResult>): MovementByFilterResult {
         const message = globalThis.Object.create((this.messagePrototype!));
         message.Objects = [];
         message.queryContext = "";
+        message.TruncatedObjects = [];
         if (value !== undefined)
             reflectionMergePartial<MovementByFilterResult>(this, message, value);
         return message;
@@ -430,6 +483,9 @@ class MovementByFilterResult$Type extends MessageType<MovementByFilterResult> {
                 case /* string queryContext */ 3:
                     message.queryContext = reader.string();
                     break;
+                case /* repeated api.TruncatedObject TruncatedObjects */ 4:
+                    message.TruncatedObjects.push(TruncatedObject.internalBinaryRead(reader, reader.uint32(), options));
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -451,6 +507,9 @@ class MovementByFilterResult$Type extends MessageType<MovementByFilterResult> {
         /* string queryContext = 3; */
         if (message.queryContext !== "")
             writer.tag(3, WireType.LengthDelimited).string(message.queryContext);
+        /* repeated api.TruncatedObject TruncatedObjects = 4; */
+        for (let i = 0; i < message.TruncatedObjects.length; i++)
+            TruncatedObject.internalBinaryWrite(message.TruncatedObjects[i], writer.tag(4, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
@@ -639,7 +698,8 @@ class MovementByOperationReferenceQuery$Type extends MessageType<MovementByOpera
         super("api.MovementByOperationReferenceQuery", [
             { no: 1, name: "Header", kind: "message", localName: "Header", jsonName: "Header", T: () => QueryProjectHeader, options: { "n1validate.rules": { message: { required: true } } } },
             { no: 2, name: "OperationReferences", kind: "scalar", localName: "OperationReferences", jsonName: "OperationReferences", repeat: 2 /*RepeatType.UNPACKED*/, T: 9 /*ScalarType.STRING*/ },
-            { no: 3, name: "Options", kind: "message", localName: "Options", jsonName: "Options", T: () => MovementQueryOptions }
+            { no: 3, name: "Options", kind: "message", localName: "Options", jsonName: "Options", T: () => MovementQueryOptions },
+            { no: 4, name: "QueryOptions", kind: "message", localName: "QueryOptions", jsonName: "QueryOptions", T: () => QueryOptions }
         ], { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_schema": { jsonSchema: { required: ["Header"] } }, "api.messageType": "Query" });
     }
     create(value?: PartialMessage<MovementByOperationReferenceQuery>): MovementByOperationReferenceQuery {
@@ -660,9 +720,12 @@ class MovementByOperationReferenceQuery$Type extends MessageType<MovementByOpera
                 case /* repeated string OperationReferences */ 2:
                     message.OperationReferences.push(reader.string());
                     break;
-                case /* api.MovementQueryOptions Options */ 3:
+                case /* api.MovementQueryOptions Options = 3 [deprecated = true] */ 3:
                     message.Options = MovementQueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.Options);
                     break;
+                case /* api.QueryOptions QueryOptions */ 4:
+                    message.QueryOptions = QueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.QueryOptions);
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -681,9 +744,12 @@ class MovementByOperationReferenceQuery$Type extends MessageType<MovementByOpera
         /* repeated string OperationReferences = 2; */
         for (let i = 0; i < message.OperationReferences.length; i++)
             writer.tag(2, WireType.LengthDelimited).string(message.OperationReferences[i]);
-        /* api.MovementQueryOptions Options = 3; */
+        /* api.MovementQueryOptions Options = 3 [deprecated = true]; */
         if (message.Options)
             MovementQueryOptions.internalBinaryWrite(message.Options, writer.tag(3, WireType.LengthDelimited).fork(), options).join();
+        /* api.QueryOptions QueryOptions = 4; */
+        if (message.QueryOptions)
+            QueryOptions.internalBinaryWrite(message.QueryOptions, writer.tag(4, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
@@ -699,12 +765,14 @@ class MovementByOperationReferenceResult$Type extends MessageType<MovementByOper
     constructor() {
         super("api.MovementByOperationReferenceResult", [
             { no: 1, name: "Header", kind: "message", localName: "Header", jsonName: "Header", T: () => ResultHeader },
-            { no: 2, name: "Objects", kind: "message", localName: "Objects", jsonName: "Objects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => Movement }
+            { no: 2, name: "Objects", kind: "message", localName: "Objects", jsonName: "Objects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => Movement },
+            { no: 3, name: "TruncatedObjects", kind: "message", localName: "TruncatedObjects", jsonName: "TruncatedObjects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => TruncatedObject }
         ], { "api.messageType": "Result" });
     }
     create(value?: PartialMessage<MovementByOperationReferenceResult>): MovementByOperationReferenceResult {
         const message = globalThis.Object.create((this.messagePrototype!));
         message.Objects = [];
+        message.TruncatedObjects = [];
         if (value !== undefined)
             reflectionMergePartial<MovementByOperationReferenceResult>(this, message, value);
         return message;
@@ -720,6 +788,9 @@ class MovementByOperationReferenceResult$Type extends MessageType<MovementByOper
                 case /* repeated api.Movement Objects */ 2:
                     message.Objects.push(Movement.internalBinaryRead(reader, reader.uint32(), options));
                     break;
+                case /* repeated api.TruncatedObject TruncatedObjects */ 3:
+                    message.TruncatedObjects.push(TruncatedObject.internalBinaryRead(reader, reader.uint32(), options));
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -738,6 +809,9 @@ class MovementByOperationReferenceResult$Type extends MessageType<MovementByOper
         /* repeated api.Movement Objects = 2; */
         for (let i = 0; i < message.Objects.length; i++)
             Movement.internalBinaryWrite(message.Objects[i], writer.tag(2, WireType.LengthDelimited).fork(), options).join();
+        /* repeated api.TruncatedObject TruncatedObjects = 3; */
+        for (let i = 0; i < message.TruncatedObjects.length; i++)
+            TruncatedObject.internalBinaryWrite(message.TruncatedObjects[i], writer.tag(3, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
diff --git a/orderQuery.ts b/orderQuery.ts
index a52b89a..9efc66c 100644
--- a/orderQuery.ts
+++ b/orderQuery.ts
@@ -21,8 +21,10 @@ import { MatchFieldResult } from "./shared";
 import { MatchField } from "./shared";
 import { EntityType } from "./shared";
 import { BlockFilter } from "./shared";
+import { TruncatedObject } from "./shared";
 import { Order } from "./order";
 import { ResultHeader } from "./shared";
+import { QueryOptions } from "./shared";
 import { QueryEntityID } from "./shared";
 import { QueryProjectHeader } from "./shared";
 // 
@@ -41,9 +43,14 @@ export interface OrderByIdQuery {
      */
     IDs: QueryEntityID[];
     /**
-     * @generated from protobuf field: api.OrderQueryOptions Options = 3
+     * @deprecated
+     * @generated from protobuf field: api.OrderQueryOptions Options = 3 [deprecated = true]
      */
     Options?: OrderQueryOptions;
+    /**
+     * @generated from protobuf field: api.QueryOptions QueryOptions = 4
+     */
+    QueryOptions?: QueryOptions;
 }
 /**
  * @generated from protobuf message api.OrderByIdResult
@@ -57,6 +64,10 @@ export interface OrderByIdResult {
      * @generated from protobuf field: repeated api.Order Objects = 2
      */
     Objects: Order[];
+    /**
+     * @generated from protobuf field: repeated api.TruncatedObject TruncatedObjects = 3
+     */
+    TruncatedObjects: TruncatedObject[];
 }
 /**
  * @generated from protobuf message api.OrderByFilterQuery
@@ -83,7 +94,8 @@ export interface OrderByFilterQuery {
      */
     BlockFilters: BlockFilter[];
     /**
-     * @generated from protobuf field: api.OrderQueryOptions Options = 7
+     * @deprecated
+     * @generated from protobuf field: api.OrderQueryOptions Options = 7 [deprecated = true]
      */
     Options?: OrderQueryOptions;
     /**
@@ -94,6 +106,10 @@ export interface OrderByFilterQuery {
      * @generated from protobuf field: string UsageContextPath = 9
      */
     UsageContextPath: string;
+    /**
+     * @generated from protobuf field: api.QueryOptions QueryOptions = 10
+     */
+    QueryOptions?: QueryOptions;
 }
 /**
  * @generated from protobuf message api.OrderByFilterResult
@@ -111,6 +127,10 @@ export interface OrderByFilterResult {
      * @generated from protobuf field: string queryContext = 3
      */
     queryContext: string;
+    /**
+     * @generated from protobuf field: repeated api.TruncatedObject TruncatedObjects = 4
+     */
+    TruncatedObjects: TruncatedObject[];
 }
 /**
  * @generated from protobuf message api.OrderQueryOptions
@@ -169,7 +189,8 @@ class OrderByIdQuery$Type extends MessageType<OrderByIdQuery> {
         super("api.OrderByIdQuery", [
             { no: 1, name: "Header", kind: "message", localName: "Header", jsonName: "Header", T: () => QueryProjectHeader, options: { "n1validate.rules": { message: { required: true } } } },
             { no: 2, name: "IDs", kind: "message", localName: "IDs", jsonName: "IDs", repeat: 2 /*RepeatType.UNPACKED*/, T: () => QueryEntityID, options: { "n1validate.rules": { repeated: { minItems: "1" } } } },
-            { no: 3, name: "Options", kind: "message", localName: "Options", jsonName: "Options", T: () => OrderQueryOptions }
+            { no: 3, name: "Options", kind: "message", localName: "Options", jsonName: "Options", T: () => OrderQueryOptions },
+            { no: 4, name: "QueryOptions", kind: "message", localName: "QueryOptions", jsonName: "QueryOptions", T: () => QueryOptions }
         ], { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_schema": { jsonSchema: { required: ["Header", "IDs"] } }, "api.messageType": "Query" });
     }
     create(value?: PartialMessage<OrderByIdQuery>): OrderByIdQuery {
@@ -190,9 +211,12 @@ class OrderByIdQuery$Type extends MessageType<OrderByIdQuery> {
                 case /* repeated api.QueryEntityID IDs */ 2:
                     message.IDs.push(QueryEntityID.internalBinaryRead(reader, reader.uint32(), options));
                     break;
-                case /* api.OrderQueryOptions Options */ 3:
+                case /* api.OrderQueryOptions Options = 3 [deprecated = true] */ 3:
                     message.Options = OrderQueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.Options);
                     break;
+                case /* api.QueryOptions QueryOptions */ 4:
+                    message.QueryOptions = QueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.QueryOptions);
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -211,9 +235,12 @@ class OrderByIdQuery$Type extends MessageType<OrderByIdQuery> {
         /* repeated api.QueryEntityID IDs = 2; */
         for (let i = 0; i < message.IDs.length; i++)
             QueryEntityID.internalBinaryWrite(message.IDs[i], writer.tag(2, WireType.LengthDelimited).fork(), options).join();
-        /* api.OrderQueryOptions Options = 3; */
+        /* api.OrderQueryOptions Options = 3 [deprecated = true]; */
         if (message.Options)
             OrderQueryOptions.internalBinaryWrite(message.Options, writer.tag(3, WireType.LengthDelimited).fork(), options).join();
+        /* api.QueryOptions QueryOptions = 4; */
+        if (message.QueryOptions)
+            QueryOptions.internalBinaryWrite(message.QueryOptions, writer.tag(4, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
@@ -229,12 +256,14 @@ class OrderByIdResult$Type extends MessageType<OrderByIdResult> {
     constructor() {
         super("api.OrderByIdResult", [
             { no: 1, name: "Header", kind: "message", localName: "Header", jsonName: "Header", T: () => ResultHeader },
-            { no: 2, name: "Objects", kind: "message", localName: "Objects", jsonName: "Objects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => Order }
+            { no: 2, name: "Objects", kind: "message", localName: "Objects", jsonName: "Objects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => Order },
+            { no: 3, name: "TruncatedObjects", kind: "message", localName: "TruncatedObjects", jsonName: "TruncatedObjects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => TruncatedObject }
         ], { "api.messageType": "Result" });
     }
     create(value?: PartialMessage<OrderByIdResult>): OrderByIdResult {
         const message = globalThis.Object.create((this.messagePrototype!));
         message.Objects = [];
+        message.TruncatedObjects = [];
         if (value !== undefined)
             reflectionMergePartial<OrderByIdResult>(this, message, value);
         return message;
@@ -250,6 +279,9 @@ class OrderByIdResult$Type extends MessageType<OrderByIdResult> {
                 case /* repeated api.Order Objects */ 2:
                     message.Objects.push(Order.internalBinaryRead(reader, reader.uint32(), options));
                     break;
+                case /* repeated api.TruncatedObject TruncatedObjects */ 3:
+                    message.TruncatedObjects.push(TruncatedObject.internalBinaryRead(reader, reader.uint32(), options));
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -268,6 +300,9 @@ class OrderByIdResult$Type extends MessageType<OrderByIdResult> {
         /* repeated api.Order Objects = 2; */
         for (let i = 0; i < message.Objects.length; i++)
             Order.internalBinaryWrite(message.Objects[i], writer.tag(2, WireType.LengthDelimited).fork(), options).join();
+        /* repeated api.TruncatedObject TruncatedObjects = 3; */
+        for (let i = 0; i < message.TruncatedObjects.length; i++)
+            TruncatedObject.internalBinaryWrite(message.TruncatedObjects[i], writer.tag(3, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
@@ -288,7 +323,8 @@ class OrderByFilterQuery$Type extends MessageType<OrderByFilterQuery> {
             { no: 6, name: "BlockFilters", kind: "message", localName: "BlockFilters", jsonName: "BlockFilters", repeat: 2 /*RepeatType.UNPACKED*/, T: () => BlockFilter },
             { no: 7, name: "Options", kind: "message", localName: "Options", jsonName: "Options", T: () => OrderQueryOptions },
             { no: 8, name: "UsageContextEntity", kind: "enum", localName: "UsageContextEntity", jsonName: "UsageContextEntity", T: () => ["api.EntityType", EntityType], options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Optional : Entity to apply the restriction rules (on the path defined with UsageContextPath)", example: "\"For Actor, to limit the results according to Order ShipFrom restriction rules, define UsageContextEntity to Order and UsageContextPath to Payload.ShipFrom\"" } } },
-            { no: 9, name: "UsageContextPath", kind: "scalar", localName: "UsageContextPath", jsonName: "UsageContextPath", T: 9 /*ScalarType.STRING*/, options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Optional : Path of restriction rule to apply (UsageContextEntity should be defined)" } } }
+            { no: 9, name: "UsageContextPath", kind: "scalar", localName: "UsageContextPath", jsonName: "UsageContextPath", T: 9 /*ScalarType.STRING*/, options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Optional : Path of restriction rule to apply (UsageContextEntity should be defined)" } } },
+            { no: 10, name: "QueryOptions", kind: "message", localName: "QueryOptions", jsonName: "QueryOptions", T: () => QueryOptions }
         ], { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_schema": { jsonSchema: { required: ["Header"] } } });
     }
     create(value?: PartialMessage<OrderByFilterQuery>): OrderByFilterQuery {
@@ -319,7 +355,7 @@ class OrderByFilterQuery$Type extends MessageType<OrderByFilterQuery> {
                 case /* repeated api.BlockFilter BlockFilters */ 6:
                     message.BlockFilters.push(BlockFilter.internalBinaryRead(reader, reader.uint32(), options));
                     break;
-                case /* api.OrderQueryOptions Options */ 7:
+                case /* api.OrderQueryOptions Options = 7 [deprecated = true] */ 7:
                     message.Options = OrderQueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.Options);
                     break;
                 case /* api.EntityType UsageContextEntity */ 8:
@@ -328,6 +364,9 @@ class OrderByFilterQuery$Type extends MessageType<OrderByFilterQuery> {
                 case /* string UsageContextPath */ 9:
                     message.UsageContextPath = reader.string();
                     break;
+                case /* api.QueryOptions QueryOptions */ 10:
+                    message.QueryOptions = QueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.QueryOptions);
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -352,7 +391,7 @@ class OrderByFilterQuery$Type extends MessageType<OrderByFilterQuery> {
         /* repeated api.BlockFilter BlockFilters = 6; */
         for (let i = 0; i < message.BlockFilters.length; i++)
             BlockFilter.internalBinaryWrite(message.BlockFilters[i], writer.tag(6, WireType.LengthDelimited).fork(), options).join();
-        /* api.OrderQueryOptions Options = 7; */
+        /* api.OrderQueryOptions Options = 7 [deprecated = true]; */
         if (message.Options)
             OrderQueryOptions.internalBinaryWrite(message.Options, writer.tag(7, WireType.LengthDelimited).fork(), options).join();
         /* api.EntityType UsageContextEntity = 8; */
@@ -361,6 +400,9 @@ class OrderByFilterQuery$Type extends MessageType<OrderByFilterQuery> {
         /* string UsageContextPath = 9; */
         if (message.UsageContextPath !== "")
             writer.tag(9, WireType.LengthDelimited).string(message.UsageContextPath);
+        /* api.QueryOptions QueryOptions = 10; */
+        if (message.QueryOptions)
+            QueryOptions.internalBinaryWrite(message.QueryOptions, writer.tag(10, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
@@ -377,13 +419,15 @@ class OrderByFilterResult$Type extends MessageType<OrderByFilterResult> {
         super("api.OrderByFilterResult", [
             { no: 1, name: "Header", kind: "message", localName: "Header", jsonName: "Header", T: () => ResultHeader },
             { no: 2, name: "Objects", kind: "message", localName: "Objects", jsonName: "Objects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => Order },
-            { no: 3, name: "queryContext", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
+            { no: 3, name: "queryContext", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
+            { no: 4, name: "TruncatedObjects", kind: "message", localName: "TruncatedObjects", jsonName: "TruncatedObjects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => TruncatedObject }
         ]);
     }
     create(value?: PartialMessage<OrderByFilterResult>): OrderByFilterResult {
         const message = globalThis.Object.create((this.messagePrototype!));
         message.Objects = [];
         message.queryContext = "";
+        message.TruncatedObjects = [];
         if (value !== undefined)
             reflectionMergePartial<OrderByFilterResult>(this, message, value);
         return message;
@@ -402,6 +446,9 @@ class OrderByFilterResult$Type extends MessageType<OrderByFilterResult> {
                 case /* string queryContext */ 3:
                     message.queryContext = reader.string();
                     break;
+                case /* repeated api.TruncatedObject TruncatedObjects */ 4:
+                    message.TruncatedObjects.push(TruncatedObject.internalBinaryRead(reader, reader.uint32(), options));
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -423,6 +470,9 @@ class OrderByFilterResult$Type extends MessageType<OrderByFilterResult> {
         /* string queryContext = 3; */
         if (message.queryContext !== "")
             writer.tag(3, WireType.LengthDelimited).string(message.queryContext);
+        /* repeated api.TruncatedObject TruncatedObjects = 4; */
+        for (let i = 0; i < message.TruncatedObjects.length; i++)
+            TruncatedObject.internalBinaryWrite(message.TruncatedObjects[i], writer.tag(4, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
diff --git a/package.json b/package.json
index 20f691b..285e751 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@reflex-platform/npm-core-sdk",
-  "version": "1.15.0-SNAPSHOT-260909085822",
+  "version": "1.15.0-SNAPSHOT-260909131049",
   "description": "npm libs from core model proto files",
   "homepage": "",
   "main": "index.ts",
diff --git a/partnerQuery.ts b/partnerQuery.ts
index c6caded..2f89900 100644
--- a/partnerQuery.ts
+++ b/partnerQuery.ts
@@ -21,8 +21,10 @@ import { MatchFieldResult } from "./shared";
 import { MatchField } from "./shared";
 import { EntityType } from "./shared";
 import { BlockFilter } from "./shared";
+import { TruncatedObject } from "./shared";
 import { Partner } from "./partner";
 import { ResultHeader } from "./shared";
+import { QueryOptions } from "./shared";
 import { QueryEntityID } from "./shared";
 import { QueryProjectHeader } from "./shared";
 // 
@@ -41,9 +43,14 @@ export interface PartnerByIdQuery {
      */
     IDs: QueryEntityID[];
     /**
-     * @generated from protobuf field: api.PartnerQueryOptions Options = 3
+     * @deprecated
+     * @generated from protobuf field: api.PartnerQueryOptions Options = 3 [deprecated = true]
      */
     Options?: PartnerQueryOptions;
+    /**
+     * @generated from protobuf field: api.QueryOptions QueryOptions = 4
+     */
+    QueryOptions?: QueryOptions;
 }
 /**
  * @generated from protobuf message api.PartnerByIdResult
@@ -57,6 +64,10 @@ export interface PartnerByIdResult {
      * @generated from protobuf field: repeated api.Partner Objects = 2
      */
     Objects: Partner[];
+    /**
+     * @generated from protobuf field: repeated api.TruncatedObject TruncatedObjects = 3
+     */
+    TruncatedObjects: TruncatedObject[];
 }
 /**
  * @generated from protobuf message api.PartnerByFilterQuery
@@ -83,7 +94,8 @@ export interface PartnerByFilterQuery {
      */
     BlockFilters: BlockFilter[];
     /**
-     * @generated from protobuf field: api.PartnerQueryOptions Options = 7
+     * @deprecated
+     * @generated from protobuf field: api.PartnerQueryOptions Options = 7 [deprecated = true]
      */
     Options?: PartnerQueryOptions;
     /**
@@ -94,6 +106,10 @@ export interface PartnerByFilterQuery {
      * @generated from protobuf field: string UsageContextPath = 9
      */
     UsageContextPath: string;
+    /**
+     * @generated from protobuf field: api.QueryOptions QueryOptions = 10
+     */
+    QueryOptions?: QueryOptions;
 }
 /**
  * @generated from protobuf message api.PartnerByFilterResult
@@ -111,6 +127,10 @@ export interface PartnerByFilterResult {
      * @generated from protobuf field: string queryContext = 3
      */
     queryContext: string;
+    /**
+     * @generated from protobuf field: repeated api.TruncatedObject TruncatedObjects = 4
+     */
+    TruncatedObjects: TruncatedObject[];
 }
 /**
  * @generated from protobuf message api.PartnerQueryOptions
@@ -165,7 +185,8 @@ class PartnerByIdQuery$Type extends MessageType<PartnerByIdQuery> {
         super("api.PartnerByIdQuery", [
             { no: 1, name: "Header", kind: "message", localName: "Header", jsonName: "Header", T: () => QueryProjectHeader, options: { "n1validate.rules": { message: { required: true } } } },
             { no: 2, name: "IDs", kind: "message", localName: "IDs", jsonName: "IDs", repeat: 2 /*RepeatType.UNPACKED*/, T: () => QueryEntityID, options: { "n1validate.rules": { repeated: { minItems: "1" } } } },
-            { no: 3, name: "Options", kind: "message", localName: "Options", jsonName: "Options", T: () => PartnerQueryOptions }
+            { no: 3, name: "Options", kind: "message", localName: "Options", jsonName: "Options", T: () => PartnerQueryOptions },
+            { no: 4, name: "QueryOptions", kind: "message", localName: "QueryOptions", jsonName: "QueryOptions", T: () => QueryOptions }
         ], { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_schema": { jsonSchema: { required: ["Header", "IDs"] } }, "api.messageType": "Query" });
     }
     create(value?: PartialMessage<PartnerByIdQuery>): PartnerByIdQuery {
@@ -186,9 +207,12 @@ class PartnerByIdQuery$Type extends MessageType<PartnerByIdQuery> {
                 case /* repeated api.QueryEntityID IDs */ 2:
                     message.IDs.push(QueryEntityID.internalBinaryRead(reader, reader.uint32(), options));
                     break;
-                case /* api.PartnerQueryOptions Options */ 3:
+                case /* api.PartnerQueryOptions Options = 3 [deprecated = true] */ 3:
                     message.Options = PartnerQueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.Options);
                     break;
+                case /* api.QueryOptions QueryOptions */ 4:
+                    message.QueryOptions = QueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.QueryOptions);
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -207,9 +231,12 @@ class PartnerByIdQuery$Type extends MessageType<PartnerByIdQuery> {
         /* repeated api.QueryEntityID IDs = 2; */
         for (let i = 0; i < message.IDs.length; i++)
             QueryEntityID.internalBinaryWrite(message.IDs[i], writer.tag(2, WireType.LengthDelimited).fork(), options).join();
-        /* api.PartnerQueryOptions Options = 3; */
+        /* api.PartnerQueryOptions Options = 3 [deprecated = true]; */
         if (message.Options)
             PartnerQueryOptions.internalBinaryWrite(message.Options, writer.tag(3, WireType.LengthDelimited).fork(), options).join();
+        /* api.QueryOptions QueryOptions = 4; */
+        if (message.QueryOptions)
+            QueryOptions.internalBinaryWrite(message.QueryOptions, writer.tag(4, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
@@ -225,12 +252,14 @@ class PartnerByIdResult$Type extends MessageType<PartnerByIdResult> {
     constructor() {
         super("api.PartnerByIdResult", [
             { no: 1, name: "Header", kind: "message", localName: "Header", jsonName: "Header", T: () => ResultHeader },
-            { no: 2, name: "Objects", kind: "message", localName: "Objects", jsonName: "Objects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => Partner }
+            { no: 2, name: "Objects", kind: "message", localName: "Objects", jsonName: "Objects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => Partner },
+            { no: 3, name: "TruncatedObjects", kind: "message", localName: "TruncatedObjects", jsonName: "TruncatedObjects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => TruncatedObject }
         ], { "api.messageType": "Result" });
     }
     create(value?: PartialMessage<PartnerByIdResult>): PartnerByIdResult {
         const message = globalThis.Object.create((this.messagePrototype!));
         message.Objects = [];
+        message.TruncatedObjects = [];
         if (value !== undefined)
             reflectionMergePartial<PartnerByIdResult>(this, message, value);
         return message;
@@ -246,6 +275,9 @@ class PartnerByIdResult$Type extends MessageType<PartnerByIdResult> {
                 case /* repeated api.Partner Objects */ 2:
                     message.Objects.push(Partner.internalBinaryRead(reader, reader.uint32(), options));
                     break;
+                case /* repeated api.TruncatedObject TruncatedObjects */ 3:
+                    message.TruncatedObjects.push(TruncatedObject.internalBinaryRead(reader, reader.uint32(), options));
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -264,6 +296,9 @@ class PartnerByIdResult$Type extends MessageType<PartnerByIdResult> {
         /* repeated api.Partner Objects = 2; */
         for (let i = 0; i < message.Objects.length; i++)
             Partner.internalBinaryWrite(message.Objects[i], writer.tag(2, WireType.LengthDelimited).fork(), options).join();
+        /* repeated api.TruncatedObject TruncatedObjects = 3; */
+        for (let i = 0; i < message.TruncatedObjects.length; i++)
+            TruncatedObject.internalBinaryWrite(message.TruncatedObjects[i], writer.tag(3, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
@@ -284,7 +319,8 @@ class PartnerByFilterQuery$Type extends MessageType<PartnerByFilterQuery> {
             { no: 6, name: "BlockFilters", kind: "message", localName: "BlockFilters", jsonName: "BlockFilters", repeat: 2 /*RepeatType.UNPACKED*/, T: () => BlockFilter },
             { no: 7, name: "Options", kind: "message", localName: "Options", jsonName: "Options", T: () => PartnerQueryOptions },
             { no: 8, name: "UsageContextEntity", kind: "enum", localName: "UsageContextEntity", jsonName: "UsageContextEntity", T: () => ["api.EntityType", EntityType], options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Optional : Entity to apply the restriction rules (on the path defined with UsageContextPath)", example: "\"For Actor, to limit the results according to Order ShipFrom restriction rules, define UsageContextEntity to Order and UsageContextPath to Payload.ShipFrom\"" } } },
-            { no: 9, name: "UsageContextPath", kind: "scalar", localName: "UsageContextPath", jsonName: "UsageContextPath", T: 9 /*ScalarType.STRING*/, options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Optional : Path of restriction rule to apply (UsageContextEntity should be defined)" } } }
+            { no: 9, name: "UsageContextPath", kind: "scalar", localName: "UsageContextPath", jsonName: "UsageContextPath", T: 9 /*ScalarType.STRING*/, options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Optional : Path of restriction rule to apply (UsageContextEntity should be defined)" } } },
+            { no: 10, name: "QueryOptions", kind: "message", localName: "QueryOptions", jsonName: "QueryOptions", T: () => QueryOptions }
         ], { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_schema": { jsonSchema: { required: ["Header"] } } });
     }
     create(value?: PartialMessage<PartnerByFilterQuery>): PartnerByFilterQuery {
@@ -315,7 +351,7 @@ class PartnerByFilterQuery$Type extends MessageType<PartnerByFilterQuery> {
                 case /* repeated api.BlockFilter BlockFilters */ 6:
                     message.BlockFilters.push(BlockFilter.internalBinaryRead(reader, reader.uint32(), options));
                     break;
-                case /* api.PartnerQueryOptions Options */ 7:
+                case /* api.PartnerQueryOptions Options = 7 [deprecated = true] */ 7:
                     message.Options = PartnerQueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.Options);
                     break;
                 case /* api.EntityType UsageContextEntity */ 8:
@@ -324,6 +360,9 @@ class PartnerByFilterQuery$Type extends MessageType<PartnerByFilterQuery> {
                 case /* string UsageContextPath */ 9:
                     message.UsageContextPath = reader.string();
                     break;
+                case /* api.QueryOptions QueryOptions */ 10:
+                    message.QueryOptions = QueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.QueryOptions);
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -348,7 +387,7 @@ class PartnerByFilterQuery$Type extends MessageType<PartnerByFilterQuery> {
         /* repeated api.BlockFilter BlockFilters = 6; */
         for (let i = 0; i < message.BlockFilters.length; i++)
             BlockFilter.internalBinaryWrite(message.BlockFilters[i], writer.tag(6, WireType.LengthDelimited).fork(), options).join();
-        /* api.PartnerQueryOptions Options = 7; */
+        /* api.PartnerQueryOptions Options = 7 [deprecated = true]; */
         if (message.Options)
             PartnerQueryOptions.internalBinaryWrite(message.Options, writer.tag(7, WireType.LengthDelimited).fork(), options).join();
         /* api.EntityType UsageContextEntity = 8; */
@@ -357,6 +396,9 @@ class PartnerByFilterQuery$Type extends MessageType<PartnerByFilterQuery> {
         /* string UsageContextPath = 9; */
         if (message.UsageContextPath !== "")
             writer.tag(9, WireType.LengthDelimited).string(message.UsageContextPath);
+        /* api.QueryOptions QueryOptions = 10; */
+        if (message.QueryOptions)
+            QueryOptions.internalBinaryWrite(message.QueryOptions, writer.tag(10, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
@@ -373,13 +415,15 @@ class PartnerByFilterResult$Type extends MessageType<PartnerByFilterResult> {
         super("api.PartnerByFilterResult", [
             { no: 1, name: "Header", kind: "message", localName: "Header", jsonName: "Header", T: () => ResultHeader },
             { no: 2, name: "Objects", kind: "message", localName: "Objects", jsonName: "Objects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => Partner },
-            { no: 3, name: "queryContext", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
+            { no: 3, name: "queryContext", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
+            { no: 4, name: "TruncatedObjects", kind: "message", localName: "TruncatedObjects", jsonName: "TruncatedObjects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => TruncatedObject }
         ]);
     }
     create(value?: PartialMessage<PartnerByFilterResult>): PartnerByFilterResult {
         const message = globalThis.Object.create((this.messagePrototype!));
         message.Objects = [];
         message.queryContext = "";
+        message.TruncatedObjects = [];
         if (value !== undefined)
             reflectionMergePartial<PartnerByFilterResult>(this, message, value);
         return message;
@@ -398,6 +442,9 @@ class PartnerByFilterResult$Type extends MessageType<PartnerByFilterResult> {
                 case /* string queryContext */ 3:
                     message.queryContext = reader.string();
                     break;
+                case /* repeated api.TruncatedObject TruncatedObjects */ 4:
+                    message.TruncatedObjects.push(TruncatedObject.internalBinaryRead(reader, reader.uint32(), options));
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -419,6 +466,9 @@ class PartnerByFilterResult$Type extends MessageType<PartnerByFilterResult> {
         /* string queryContext = 3; */
         if (message.queryContext !== "")
             writer.tag(3, WireType.LengthDelimited).string(message.queryContext);
+        /* repeated api.TruncatedObject TruncatedObjects = 4; */
+        for (let i = 0; i < message.TruncatedObjects.length; i++)
+            TruncatedObject.internalBinaryWrite(message.TruncatedObjects[i], writer.tag(4, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
diff --git a/shared.ts b/shared.ts
index 334261c..ad2e5d5 100644
--- a/shared.ts
+++ b/shared.ts
@@ -291,6 +291,64 @@ export interface QueryProjectHeader {
      */
     LocalizedLabel: boolean;
 }
+/**
+ * Options for query messages, including field selection and array truncation
+ *
+ * @generated from protobuf message api.QueryOptions
+ */
+export interface QueryOptions {
+    /**
+     * @generated from protobuf field: repeated string Only = 2
+     */
+    Only: string[];
+    /**
+     * @generated from protobuf field: repeated api.QueryTruncateArray TruncateArrays = 3
+     */
+    TruncateArrays: QueryTruncateArray[];
+}
+/**
+ * @generated from protobuf message api.QueryTruncateArray
+ */
+export interface QueryTruncateArray {
+    /**
+     * @generated from protobuf field: string Path = 1
+     */
+    Path: string;
+    /**
+     * @generated from protobuf field: int32 Length = 2
+     */
+    Length: number;
+}
+/**
+ * @generated from protobuf message api.TruncateArrayResult
+ */
+export interface TruncateArrayResult {
+    /**
+     * @generated from protobuf field: string Path = 1
+     */
+    Path: string;
+    /**
+     * @generated from protobuf field: int32 TruncatedArrayLength = 2
+     */
+    TruncatedArrayLength: number;
+    /**
+     * @generated from protobuf field: int32 TotalArrayLength = 3
+     */
+    TotalArrayLength: number;
+}
+/**
+ * @generated from protobuf message api.TruncatedObject
+ */
+export interface TruncatedObject {
+    /**
+     * @generated from protobuf field: string RefID = 1
+     */
+    RefID: string;
+    /**
+     * @generated from protobuf field: repeated api.TruncateArrayResult TruncateArrayResults = 3
+     */
+    TruncateArrayResults: TruncateArrayResult[];
+}
 /**
  * @generated from protobuf message api.ResultHeader
  */
@@ -3992,6 +4050,234 @@ class QueryProjectHeader$Type extends MessageType<QueryProjectHeader> {
  */
 export const QueryProjectHeader = new QueryProjectHeader$Type();
 // @generated message type with reflection information, may provide speed optimized methods
+class QueryOptions$Type extends MessageType<QueryOptions> {
+    constructor() {
+        super("api.QueryOptions", [
+            { no: 2, name: "Only", kind: "scalar", localName: "Only", jsonName: "Only", repeat: 2 /*RepeatType.UNPACKED*/, T: 9 /*ScalarType.STRING*/, options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Optional : List of fields to include in the response for each returned object", example: "[\"ID.RefID\", \"Payload.Name\", \"Payload.Lines.ID\"]" } } },
+            { no: 3, name: "TruncateArrays", kind: "message", localName: "TruncateArrays", jsonName: "TruncateArrays", repeat: 2 /*RepeatType.UNPACKED*/, T: () => QueryTruncateArray, options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Optional : List of array fields to truncate the length in the response for each returned object", example: "[ {\"Path\" : \"Payload.Lines\", \"Length\": 10}]" } } }
+        ]);
+    }
+    create(value?: PartialMessage<QueryOptions>): QueryOptions {
+        const message = globalThis.Object.create((this.messagePrototype!));
+        message.Only = [];
+        message.TruncateArrays = [];
+        if (value !== undefined)
+            reflectionMergePartial<QueryOptions>(this, message, value);
+        return message;
+    }
+    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: QueryOptions): QueryOptions {
+        let message = target ?? this.create(), end = reader.pos + length;
+        while (reader.pos < end) {
+            let [fieldNo, wireType] = reader.tag();
+            switch (fieldNo) {
+                case /* repeated string Only */ 2:
+                    message.Only.push(reader.string());
+                    break;
+                case /* repeated api.QueryTruncateArray TruncateArrays */ 3:
+                    message.TruncateArrays.push(QueryTruncateArray.internalBinaryRead(reader, reader.uint32(), options));
+                    break;
+                default:
+                    let u = options.readUnknownField;
+                    if (u === "throw")
+                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
+                    let d = reader.skip(wireType);
+                    if (u !== false)
+                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
+            }
+        }
+        return message;
+    }
+    internalBinaryWrite(message: QueryOptions, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
+        /* repeated string Only = 2; */
+        for (let i = 0; i < message.Only.length; i++)
+            writer.tag(2, WireType.LengthDelimited).string(message.Only[i]);
+        /* repeated api.QueryTruncateArray TruncateArrays = 3; */
+        for (let i = 0; i < message.TruncateArrays.length; i++)
+            QueryTruncateArray.internalBinaryWrite(message.TruncateArrays[i], writer.tag(3, WireType.LengthDelimited).fork(), options).join();
+        let u = options.writeUnknownFields;
+        if (u !== false)
+            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
+        return writer;
+    }
+}
+/**
+ * @generated MessageType for protobuf message api.QueryOptions
+ */
+export const QueryOptions = new QueryOptions$Type();
+// @generated message type with reflection information, may provide speed optimized methods
+class QueryTruncateArray$Type extends MessageType<QueryTruncateArray> {
+    constructor() {
+        super("api.QueryTruncateArray", [
+            { no: 1, name: "Path", kind: "scalar", localName: "Path", jsonName: "Path", T: 9 /*ScalarType.STRING*/ },
+            { no: 2, name: "Length", kind: "scalar", localName: "Length", jsonName: "Length", T: 5 /*ScalarType.INT32*/ }
+        ]);
+    }
+    create(value?: PartialMessage<QueryTruncateArray>): QueryTruncateArray {
+        const message = globalThis.Object.create((this.messagePrototype!));
+        message.Path = "";
+        message.Length = 0;
+        if (value !== undefined)
+            reflectionMergePartial<QueryTruncateArray>(this, message, value);
+        return message;
+    }
+    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: QueryTruncateArray): QueryTruncateArray {
+        let message = target ?? this.create(), end = reader.pos + length;
+        while (reader.pos < end) {
+            let [fieldNo, wireType] = reader.tag();
+            switch (fieldNo) {
+                case /* string Path */ 1:
+                    message.Path = reader.string();
+                    break;
+                case /* int32 Length */ 2:
+                    message.Length = reader.int32();
+                    break;
+                default:
+                    let u = options.readUnknownField;
+                    if (u === "throw")
+                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
+                    let d = reader.skip(wireType);
+                    if (u !== false)
+                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
+            }
+        }
+        return message;
+    }
+    internalBinaryWrite(message: QueryTruncateArray, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
+        /* string Path = 1; */
+        if (message.Path !== "")
+            writer.tag(1, WireType.LengthDelimited).string(message.Path);
+        /* int32 Length = 2; */
+        if (message.Length !== 0)
+            writer.tag(2, WireType.Varint).int32(message.Length);
+        let u = options.writeUnknownFields;
+        if (u !== false)
+            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
+        return writer;
+    }
+}
+/**
+ * @generated MessageType for protobuf message api.QueryTruncateArray
+ */
+export const QueryTruncateArray = new QueryTruncateArray$Type();
+// @generated message type with reflection information, may provide speed optimized methods
+class TruncateArrayResult$Type extends MessageType<TruncateArrayResult> {
+    constructor() {
+        super("api.TruncateArrayResult", [
+            { no: 1, name: "Path", kind: "scalar", localName: "Path", jsonName: "Path", T: 9 /*ScalarType.STRING*/ },
+            { no: 2, name: "TruncatedArrayLength", kind: "scalar", localName: "TruncatedArrayLength", jsonName: "TruncatedArrayLength", T: 5 /*ScalarType.INT32*/ },
+            { no: 3, name: "TotalArrayLength", kind: "scalar", localName: "TotalArrayLength", jsonName: "TotalArrayLength", T: 5 /*ScalarType.INT32*/ }
+        ]);
+    }
+    create(value?: PartialMessage<TruncateArrayResult>): TruncateArrayResult {
+        const message = globalThis.Object.create((this.messagePrototype!));
+        message.Path = "";
+        message.TruncatedArrayLength = 0;
+        message.TotalArrayLength = 0;
+        if (value !== undefined)
+            reflectionMergePartial<TruncateArrayResult>(this, message, value);
+        return message;
+    }
+    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: TruncateArrayResult): TruncateArrayResult {
+        let message = target ?? this.create(), end = reader.pos + length;
+        while (reader.pos < end) {
+            let [fieldNo, wireType] = reader.tag();
+            switch (fieldNo) {
+                case /* string Path */ 1:
+                    message.Path = reader.string();
+                    break;
+                case /* int32 TruncatedArrayLength */ 2:
+                    message.TruncatedArrayLength = reader.int32();
+                    break;
+                case /* int32 TotalArrayLength */ 3:
+                    message.TotalArrayLength = reader.int32();
+                    break;
+                default:
+                    let u = options.readUnknownField;
+                    if (u === "throw")
+                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
+                    let d = reader.skip(wireType);
+                    if (u !== false)
+                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
+            }
+        }
+        return message;
+    }
+    internalBinaryWrite(message: TruncateArrayResult, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
+        /* string Path = 1; */
+        if (message.Path !== "")
+            writer.tag(1, WireType.LengthDelimited).string(message.Path);
+        /* int32 TruncatedArrayLength = 2; */
+        if (message.TruncatedArrayLength !== 0)
+            writer.tag(2, WireType.Varint).int32(message.TruncatedArrayLength);
+        /* int32 TotalArrayLength = 3; */
+        if (message.TotalArrayLength !== 0)
+            writer.tag(3, WireType.Varint).int32(message.TotalArrayLength);
+        let u = options.writeUnknownFields;
+        if (u !== false)
+            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
+        return writer;
+    }
+}
+/**
+ * @generated MessageType for protobuf message api.TruncateArrayResult
+ */
+export const TruncateArrayResult = new TruncateArrayResult$Type();
+// @generated message type with reflection information, may provide speed optimized methods
+class TruncatedObject$Type extends MessageType<TruncatedObject> {
+    constructor() {
+        super("api.TruncatedObject", [
+            { no: 1, name: "RefID", kind: "scalar", localName: "RefID", jsonName: "RefID", T: 9 /*ScalarType.STRING*/ },
+            { no: 3, name: "TruncateArrayResults", kind: "message", localName: "TruncateArrayResults", jsonName: "TruncateArrayResults", repeat: 2 /*RepeatType.UNPACKED*/, T: () => TruncateArrayResult }
+        ]);
+    }
+    create(value?: PartialMessage<TruncatedObject>): TruncatedObject {
+        const message = globalThis.Object.create((this.messagePrototype!));
+        message.RefID = "";
+        message.TruncateArrayResults = [];
+        if (value !== undefined)
+            reflectionMergePartial<TruncatedObject>(this, message, value);
+        return message;
+    }
+    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: TruncatedObject): TruncatedObject {
+        let message = target ?? this.create(), end = reader.pos + length;
+        while (reader.pos < end) {
+            let [fieldNo, wireType] = reader.tag();
+            switch (fieldNo) {
+                case /* string RefID */ 1:
+                    message.RefID = reader.string();
+                    break;
+                case /* repeated api.TruncateArrayResult TruncateArrayResults */ 3:
+                    message.TruncateArrayResults.push(TruncateArrayResult.internalBinaryRead(reader, reader.uint32(), options));
+                    break;
+                default:
+                    let u = options.readUnknownField;
+                    if (u === "throw")
+                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
+                    let d = reader.skip(wireType);
+                    if (u !== false)
+                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
+            }
+        }
+        return message;
+    }
+    internalBinaryWrite(message: TruncatedObject, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
+        /* string RefID = 1; */
+        if (message.RefID !== "")
+            writer.tag(1, WireType.LengthDelimited).string(message.RefID);
+        /* repeated api.TruncateArrayResult TruncateArrayResults = 3; */
+        for (let i = 0; i < message.TruncateArrayResults.length; i++)
+            TruncateArrayResult.internalBinaryWrite(message.TruncateArrayResults[i], writer.tag(3, WireType.LengthDelimited).fork(), options).join();
+        let u = options.writeUnknownFields;
+        if (u !== false)
+            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
+        return writer;
+    }
+}
+/**
+ * @generated MessageType for protobuf message api.TruncatedObject
+ */
+export const TruncatedObject = new TruncatedObject$Type();
+// @generated message type with reflection information, may provide speed optimized methods
 class ResultHeader$Type extends MessageType<ResultHeader> {
     constructor() {
         super("api.ResultHeader", [
diff --git a/stockQuery.ts b/stockQuery.ts
index e5e830b..8590d97 100644
--- a/stockQuery.ts
+++ b/stockQuery.ts
@@ -30,8 +30,10 @@ import { MatchFieldResult } from "./shared";
 import { MatchField } from "./shared";
 import { EntityType } from "./shared";
 import { BlockFilter } from "./shared";
+import { TruncatedObject } from "./shared";
 import { Stock } from "./stock";
 import { ResultHeader } from "./shared";
+import { QueryOptions } from "./shared";
 import { QueryEntityID } from "./shared";
 import { QueryProjectHeader } from "./shared";
 // 
@@ -50,9 +52,14 @@ export interface StockByIdQuery {
      */
     IDs: QueryEntityID[];
     /**
-     * @generated from protobuf field: api.StockQueryOptions Options = 3
+     * @deprecated
+     * @generated from protobuf field: api.StockQueryOptions Options = 3 [deprecated = true]
      */
     Options?: StockQueryOptions;
+    /**
+     * @generated from protobuf field: api.QueryOptions QueryOptions = 4
+     */
+    QueryOptions?: QueryOptions;
 }
 /**
  * @generated from protobuf message api.StockByIdResult
@@ -66,6 +73,10 @@ export interface StockByIdResult {
      * @generated from protobuf field: repeated api.Stock Objects = 2
      */
     Objects: Stock[];
+    /**
+     * @generated from protobuf field: repeated api.TruncatedObject TruncatedObjects = 3
+     */
+    TruncatedObjects: TruncatedObject[];
 }
 /**
  * @generated from protobuf message api.StockByFilterQuery
@@ -92,7 +103,8 @@ export interface StockByFilterQuery {
      */
     BlockFilters: BlockFilter[];
     /**
-     * @generated from protobuf field: api.StockQueryOptions Options = 8
+     * @deprecated
+     * @generated from protobuf field: api.StockQueryOptions Options = 8 [deprecated = true]
      */
     Options?: StockQueryOptions;
     /**
@@ -103,6 +115,10 @@ export interface StockByFilterQuery {
      * @generated from protobuf field: string UsageContextPath = 10
      */
     UsageContextPath: string;
+    /**
+     * @generated from protobuf field: api.QueryOptions QueryOptions = 11
+     */
+    QueryOptions?: QueryOptions;
 }
 /**
  * @generated from protobuf message api.StockByFilterResult
@@ -120,6 +136,10 @@ export interface StockByFilterResult {
      * @generated from protobuf field: string queryContext = 3
      */
     queryContext: string;
+    /**
+     * @generated from protobuf field: repeated api.TruncatedObject TruncatedObjects = 4
+     */
+    TruncatedObjects: TruncatedObject[];
 }
 /**
  * @generated from protobuf message api.StockQueryOptions
@@ -178,7 +198,8 @@ class StockByIdQuery$Type extends MessageType<StockByIdQuery> {
         super("api.StockByIdQuery", [
             { no: 1, name: "Header", kind: "message", localName: "Header", jsonName: "Header", T: () => QueryProjectHeader, options: { "n1validate.rules": { message: { required: true } } } },
             { no: 2, name: "IDs", kind: "message", localName: "IDs", jsonName: "IDs", repeat: 2 /*RepeatType.UNPACKED*/, T: () => QueryEntityID, options: { "n1validate.rules": { repeated: { minItems: "1" } } } },
-            { no: 3, name: "Options", kind: "message", localName: "Options", jsonName: "Options", T: () => StockQueryOptions }
+            { no: 3, name: "Options", kind: "message", localName: "Options", jsonName: "Options", T: () => StockQueryOptions },
+            { no: 4, name: "QueryOptions", kind: "message", localName: "QueryOptions", jsonName: "QueryOptions", T: () => QueryOptions }
         ], { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_schema": { jsonSchema: { required: ["Header", "IDs"] } }, "api.messageType": "Query" });
     }
     create(value?: PartialMessage<StockByIdQuery>): StockByIdQuery {
@@ -199,9 +220,12 @@ class StockByIdQuery$Type extends MessageType<StockByIdQuery> {
                 case /* repeated api.QueryEntityID IDs */ 2:
                     message.IDs.push(QueryEntityID.internalBinaryRead(reader, reader.uint32(), options));
                     break;
-                case /* api.StockQueryOptions Options */ 3:
+                case /* api.StockQueryOptions Options = 3 [deprecated = true] */ 3:
                     message.Options = StockQueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.Options);
                     break;
+                case /* api.QueryOptions QueryOptions */ 4:
+                    message.QueryOptions = QueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.QueryOptions);
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -220,9 +244,12 @@ class StockByIdQuery$Type extends MessageType<StockByIdQuery> {
         /* repeated api.QueryEntityID IDs = 2; */
         for (let i = 0; i < message.IDs.length; i++)
             QueryEntityID.internalBinaryWrite(message.IDs[i], writer.tag(2, WireType.LengthDelimited).fork(), options).join();
-        /* api.StockQueryOptions Options = 3; */
+        /* api.StockQueryOptions Options = 3 [deprecated = true]; */
         if (message.Options)
             StockQueryOptions.internalBinaryWrite(message.Options, writer.tag(3, WireType.LengthDelimited).fork(), options).join();
+        /* api.QueryOptions QueryOptions = 4; */
+        if (message.QueryOptions)
+            QueryOptions.internalBinaryWrite(message.QueryOptions, writer.tag(4, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
@@ -238,12 +265,14 @@ class StockByIdResult$Type extends MessageType<StockByIdResult> {
     constructor() {
         super("api.StockByIdResult", [
             { no: 1, name: "Header", kind: "message", localName: "Header", jsonName: "Header", T: () => ResultHeader },
-            { no: 2, name: "Objects", kind: "message", localName: "Objects", jsonName: "Objects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => Stock }
+            { no: 2, name: "Objects", kind: "message", localName: "Objects", jsonName: "Objects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => Stock },
+            { no: 3, name: "TruncatedObjects", kind: "message", localName: "TruncatedObjects", jsonName: "TruncatedObjects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => TruncatedObject }
         ], { "api.messageType": "Result" });
     }
     create(value?: PartialMessage<StockByIdResult>): StockByIdResult {
         const message = globalThis.Object.create((this.messagePrototype!));
         message.Objects = [];
+        message.TruncatedObjects = [];
         if (value !== undefined)
             reflectionMergePartial<StockByIdResult>(this, message, value);
         return message;
@@ -259,6 +288,9 @@ class StockByIdResult$Type extends MessageType<StockByIdResult> {
                 case /* repeated api.Stock Objects */ 2:
                     message.Objects.push(Stock.internalBinaryRead(reader, reader.uint32(), options));
                     break;
+                case /* repeated api.TruncatedObject TruncatedObjects */ 3:
+                    message.TruncatedObjects.push(TruncatedObject.internalBinaryRead(reader, reader.uint32(), options));
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -277,6 +309,9 @@ class StockByIdResult$Type extends MessageType<StockByIdResult> {
         /* repeated api.Stock Objects = 2; */
         for (let i = 0; i < message.Objects.length; i++)
             Stock.internalBinaryWrite(message.Objects[i], writer.tag(2, WireType.LengthDelimited).fork(), options).join();
+        /* repeated api.TruncatedObject TruncatedObjects = 3; */
+        for (let i = 0; i < message.TruncatedObjects.length; i++)
+            TruncatedObject.internalBinaryWrite(message.TruncatedObjects[i], writer.tag(3, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
@@ -297,7 +332,8 @@ class StockByFilterQuery$Type extends MessageType<StockByFilterQuery> {
             { no: 7, name: "BlockFilters", kind: "message", localName: "BlockFilters", jsonName: "BlockFilters", repeat: 2 /*RepeatType.UNPACKED*/, T: () => BlockFilter },
             { no: 8, name: "Options", kind: "message", localName: "Options", jsonName: "Options", T: () => StockQueryOptions },
             { no: 9, name: "UsageContextEntity", kind: "enum", localName: "UsageContextEntity", jsonName: "UsageContextEntity", T: () => ["api.EntityType", EntityType], options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Optional : Entity to apply the restriction rules (on the path defined with UsageContextPath)", example: "\"For Actor, to limit the results according to Order ShipFrom restriction rules, define UsageContextEntity to Order and UsageContextPath to Payload.ShipFrom\"" } } },
-            { no: 10, name: "UsageContextPath", kind: "scalar", localName: "UsageContextPath", jsonName: "UsageContextPath", T: 9 /*ScalarType.STRING*/, options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Optional : Path of restriction rule to apply (UsageContextEntity should be defined)" } } }
+            { no: 10, name: "UsageContextPath", kind: "scalar", localName: "UsageContextPath", jsonName: "UsageContextPath", T: 9 /*ScalarType.STRING*/, options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Optional : Path of restriction rule to apply (UsageContextEntity should be defined)" } } },
+            { no: 11, name: "QueryOptions", kind: "message", localName: "QueryOptions", jsonName: "QueryOptions", T: () => QueryOptions }
         ], { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_schema": { jsonSchema: { required: ["Header"] } } });
     }
     create(value?: PartialMessage<StockByFilterQuery>): StockByFilterQuery {
@@ -328,7 +364,7 @@ class StockByFilterQuery$Type extends MessageType<StockByFilterQuery> {
                 case /* repeated api.BlockFilter BlockFilters */ 7:
                     message.BlockFilters.push(BlockFilter.internalBinaryRead(reader, reader.uint32(), options));
                     break;
-                case /* api.StockQueryOptions Options */ 8:
+                case /* api.StockQueryOptions Options = 8 [deprecated = true] */ 8:
                     message.Options = StockQueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.Options);
                     break;
                 case /* api.EntityType UsageContextEntity */ 9:
@@ -337,6 +373,9 @@ class StockByFilterQuery$Type extends MessageType<StockByFilterQuery> {
                 case /* string UsageContextPath */ 10:
                     message.UsageContextPath = reader.string();
                     break;
+                case /* api.QueryOptions QueryOptions */ 11:
+                    message.QueryOptions = QueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.QueryOptions);
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -361,7 +400,7 @@ class StockByFilterQuery$Type extends MessageType<StockByFilterQuery> {
         /* repeated api.BlockFilter BlockFilters = 7; */
         for (let i = 0; i < message.BlockFilters.length; i++)
             BlockFilter.internalBinaryWrite(message.BlockFilters[i], writer.tag(7, WireType.LengthDelimited).fork(), options).join();
-        /* api.StockQueryOptions Options = 8; */
+        /* api.StockQueryOptions Options = 8 [deprecated = true]; */
         if (message.Options)
             StockQueryOptions.internalBinaryWrite(message.Options, writer.tag(8, WireType.LengthDelimited).fork(), options).join();
         /* api.EntityType UsageContextEntity = 9; */
@@ -370,6 +409,9 @@ class StockByFilterQuery$Type extends MessageType<StockByFilterQuery> {
         /* string UsageContextPath = 10; */
         if (message.UsageContextPath !== "")
             writer.tag(10, WireType.LengthDelimited).string(message.UsageContextPath);
+        /* api.QueryOptions QueryOptions = 11; */
+        if (message.QueryOptions)
+            QueryOptions.internalBinaryWrite(message.QueryOptions, writer.tag(11, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
@@ -386,13 +428,15 @@ class StockByFilterResult$Type extends MessageType<StockByFilterResult> {
         super("api.StockByFilterResult", [
             { no: 1, name: "Header", kind: "message", localName: "Header", jsonName: "Header", T: () => ResultHeader },
             { no: 2, name: "Objects", kind: "message", localName: "Objects", jsonName: "Objects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => Stock },
-            { no: 3, name: "queryContext", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
+            { no: 3, name: "queryContext", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
+            { no: 4, name: "TruncatedObjects", kind: "message", localName: "TruncatedObjects", jsonName: "TruncatedObjects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => TruncatedObject }
         ]);
     }
     create(value?: PartialMessage<StockByFilterResult>): StockByFilterResult {
         const message = globalThis.Object.create((this.messagePrototype!));
         message.Objects = [];
         message.queryContext = "";
+        message.TruncatedObjects = [];
         if (value !== undefined)
             reflectionMergePartial<StockByFilterResult>(this, message, value);
         return message;
@@ -411,6 +455,9 @@ class StockByFilterResult$Type extends MessageType<StockByFilterResult> {
                 case /* string queryContext */ 3:
                     message.queryContext = reader.string();
                     break;
+                case /* repeated api.TruncatedObject TruncatedObjects */ 4:
+                    message.TruncatedObjects.push(TruncatedObject.internalBinaryRead(reader, reader.uint32(), options));
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -432,6 +479,9 @@ class StockByFilterResult$Type extends MessageType<StockByFilterResult> {
         /* string queryContext = 3; */
         if (message.queryContext !== "")
             writer.tag(3, WireType.LengthDelimited).string(message.queryContext);
+        /* repeated api.TruncatedObject TruncatedObjects = 4; */
+        for (let i = 0; i < message.TruncatedObjects.length; i++)
+            TruncatedObject.internalBinaryWrite(message.TruncatedObjects[i], writer.tag(4, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
diff --git a/trackingQuery.ts b/trackingQuery.ts
index a2911bc..d1b2f2c 100644
--- a/trackingQuery.ts
+++ b/trackingQuery.ts
@@ -13,8 +13,10 @@ import { UnknownFieldHandler } from "@protobuf-ts/runtime";
 import type { PartialMessage } from "@protobuf-ts/runtime";
 import { reflectionMergePartial } from "@protobuf-ts/runtime";
 import { MessageType } from "@protobuf-ts/runtime";
+import { TruncatedObject } from "./shared";
 import { Tracking } from "./tracking";
 import { ResultHeader } from "./shared";
+import { QueryOptions } from "./shared";
 import { QueryEntityID } from "./shared";
 import { QueryProjectHeader } from "./shared";
 // 
@@ -33,9 +35,14 @@ export interface TrackingByIdQuery {
      */
     IDs: QueryEntityID[];
     /**
-     * @generated from protobuf field: api.TrackingQueryOptions Options = 3
+     * @deprecated
+     * @generated from protobuf field: api.TrackingQueryOptions Options = 3 [deprecated = true]
      */
     Options?: TrackingQueryOptions;
+    /**
+     * @generated from protobuf field: api.QueryOptions QueryOptions = 4
+     */
+    QueryOptions?: QueryOptions;
 }
 /**
  * @generated from protobuf message api.TrackingByIdResult
@@ -49,6 +56,10 @@ export interface TrackingByIdResult {
      * @generated from protobuf field: repeated api.Tracking Objects = 2
      */
     Objects: Tracking[];
+    /**
+     * @generated from protobuf field: repeated api.TruncatedObject TruncatedObjects = 3
+     */
+    TruncatedObjects: TruncatedObject[];
 }
 /**
  * @generated from protobuf message api.TrackingQueryOptions
@@ -65,7 +76,8 @@ class TrackingByIdQuery$Type extends MessageType<TrackingByIdQuery> {
         super("api.TrackingByIdQuery", [
             { no: 1, name: "Header", kind: "message", localName: "Header", jsonName: "Header", T: () => QueryProjectHeader, options: { "n1validate.rules": { message: { required: true } } } },
             { no: 2, name: "IDs", kind: "message", localName: "IDs", jsonName: "IDs", repeat: 2 /*RepeatType.UNPACKED*/, T: () => QueryEntityID, options: { "n1validate.rules": { repeated: { minItems: "1" } } } },
-            { no: 3, name: "Options", kind: "message", localName: "Options", jsonName: "Options", T: () => TrackingQueryOptions }
+            { no: 3, name: "Options", kind: "message", localName: "Options", jsonName: "Options", T: () => TrackingQueryOptions },
+            { no: 4, name: "QueryOptions", kind: "message", localName: "QueryOptions", jsonName: "QueryOptions", T: () => QueryOptions }
         ], { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_schema": { jsonSchema: { required: ["Header", "IDs"] } }, "api.messageType": "Query" });
     }
     create(value?: PartialMessage<TrackingByIdQuery>): TrackingByIdQuery {
@@ -86,9 +98,12 @@ class TrackingByIdQuery$Type extends MessageType<TrackingByIdQuery> {
                 case /* repeated api.QueryEntityID IDs */ 2:
                     message.IDs.push(QueryEntityID.internalBinaryRead(reader, reader.uint32(), options));
                     break;
-                case /* api.TrackingQueryOptions Options */ 3:
+                case /* api.TrackingQueryOptions Options = 3 [deprecated = true] */ 3:
                     message.Options = TrackingQueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.Options);
                     break;
+                case /* api.QueryOptions QueryOptions */ 4:
+                    message.QueryOptions = QueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.QueryOptions);
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -107,9 +122,12 @@ class TrackingByIdQuery$Type extends MessageType<TrackingByIdQuery> {
         /* repeated api.QueryEntityID IDs = 2; */
         for (let i = 0; i < message.IDs.length; i++)
             QueryEntityID.internalBinaryWrite(message.IDs[i], writer.tag(2, WireType.LengthDelimited).fork(), options).join();
-        /* api.TrackingQueryOptions Options = 3; */
+        /* api.TrackingQueryOptions Options = 3 [deprecated = true]; */
         if (message.Options)
             TrackingQueryOptions.internalBinaryWrite(message.Options, writer.tag(3, WireType.LengthDelimited).fork(), options).join();
+        /* api.QueryOptions QueryOptions = 4; */
+        if (message.QueryOptions)
+            QueryOptions.internalBinaryWrite(message.QueryOptions, writer.tag(4, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
@@ -125,12 +143,14 @@ class TrackingByIdResult$Type extends MessageType<TrackingByIdResult> {
     constructor() {
         super("api.TrackingByIdResult", [
             { no: 1, name: "Header", kind: "message", localName: "Header", jsonName: "Header", T: () => ResultHeader },
-            { no: 2, name: "Objects", kind: "message", localName: "Objects", jsonName: "Objects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => Tracking }
+            { no: 2, name: "Objects", kind: "message", localName: "Objects", jsonName: "Objects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => Tracking },
+            { no: 3, name: "TruncatedObjects", kind: "message", localName: "TruncatedObjects", jsonName: "TruncatedObjects", repeat: 2 /*RepeatType.UNPACKED*/, T: () => TruncatedObject }
         ], { "api.messageType": "Result" });
     }
     create(value?: PartialMessage<TrackingByIdResult>): TrackingByIdResult {
         const message = globalThis.Object.create((this.messagePrototype!));
         message.Objects = [];
+        message.TruncatedObjects = [];
         if (value !== undefined)
             reflectionMergePartial<TrackingByIdResult>(this, message, value);
         return message;
@@ -146,6 +166,9 @@ class TrackingByIdResult$Type extends MessageType<TrackingByIdResult> {
                 case /* repeated api.Tracking Objects */ 2:
                     message.Objects.push(Tracking.internalBinaryRead(reader, reader.uint32(), options));
                     break;
+                case /* repeated api.TruncatedObject TruncatedObjects */ 3:
+                    message.TruncatedObjects.push(TruncatedObject.internalBinaryRead(reader, reader.uint32(), options));
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -164,6 +187,9 @@ class TrackingByIdResult$Type extends MessageType<TrackingByIdResult> {
         /* repeated api.Tracking Objects = 2; */
         for (let i = 0; i < message.Objects.length; i++)
             Tracking.internalBinaryWrite(message.Objects[i], writer.tag(2, WireType.LengthDelimited).fork(), options).join();
+        /* repeated api.TruncatedObject TruncatedObjects = 3; */
+        for (let i = 0; i < message.TruncatedObjects.length; i++)
+            TruncatedObject.internalBinaryWrite(message.TruncatedObjects[i], writer.tag(3, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);