diff --git a/actorQuery.ts b/actorQuery.ts
index 839bc4d..48c40ad 100644
--- a/actorQuery.ts
+++ b/actorQuery.ts
@@ -19,6 +19,7 @@ import { reflectionMergePartial } from "@protobuf-ts/runtime";
 import { MessageType } from "@protobuf-ts/runtime";
 import { MatchFieldResult } from "./shared";
 import { MatchField } from "./shared";
+import { EntityType } from "./shared";
 import { BlockFilter } from "./shared";
 import { Actor } from "./actor";
 import { ResultHeader } from "./shared";
@@ -85,6 +86,14 @@ export interface ActorByFilterQuery {
      * @generated from protobuf field: api.ActorQueryOptions Options = 7
      */
     Options?: ActorQueryOptions;
+    /**
+     * @generated from protobuf field: api.EntityType UsageContextEntity = 8
+     */
+    UsageContextEntity: EntityType;
+    /**
+     * @generated from protobuf field: string UsageContextPath = 9
+     */
+    UsageContextPath: string;
 }
 /**
  * @generated from protobuf message api.ActorByFilterResult
@@ -261,7 +270,9 @@ class ActorByFilterQuery$Type extends MessageType<ActorByFilterQuery> {
             { no: 4, name: "limitFilter", kind: "scalar", T: 9 /*ScalarType.STRING*/, options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Number of maximum result", example: "\"500\"" } } },
             { no: 5, name: "queryContext", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
             { 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: 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)" } } }
         ], { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_schema": { jsonSchema: { required: ["Header"] } } });
     }
     create(value?: PartialMessage<ActorByFilterQuery>): ActorByFilterQuery {
@@ -269,6 +280,8 @@ class ActorByFilterQuery$Type extends MessageType<ActorByFilterQuery> {
         message.limitFilter = "";
         message.queryContext = "";
         message.BlockFilters = [];
+        message.UsageContextEntity = 0;
+        message.UsageContextPath = "";
         if (value !== undefined)
             reflectionMergePartial<ActorByFilterQuery>(this, message, value);
         return message;
@@ -293,6 +306,12 @@ class ActorByFilterQuery$Type extends MessageType<ActorByFilterQuery> {
                 case /* api.ActorQueryOptions Options */ 7:
                     message.Options = ActorQueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.Options);
                     break;
+                case /* api.EntityType UsageContextEntity */ 8:
+                    message.UsageContextEntity = reader.int32();
+                    break;
+                case /* string UsageContextPath */ 9:
+                    message.UsageContextPath = reader.string();
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -320,6 +339,12 @@ class ActorByFilterQuery$Type extends MessageType<ActorByFilterQuery> {
         /* api.ActorQueryOptions Options = 7; */
         if (message.Options)
             ActorQueryOptions.internalBinaryWrite(message.Options, writer.tag(7, WireType.LengthDelimited).fork(), options).join();
+        /* api.EntityType UsageContextEntity = 8; */
+        if (message.UsageContextEntity !== 0)
+            writer.tag(8, WireType.Varint).int32(message.UsageContextEntity);
+        /* string UsageContextPath = 9; */
+        if (message.UsageContextPath !== "")
+            writer.tag(9, WireType.LengthDelimited).string(message.UsageContextPath);
         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 c3d7171..d5d2dd9 100644
--- a/appointmentQuery.ts
+++ b/appointmentQuery.ts
@@ -21,6 +21,7 @@ import { reflectionMergePartial } from "@protobuf-ts/runtime";
 import { MessageType } from "@protobuf-ts/runtime";
 import { MatchFieldResult } from "./shared";
 import { MatchField } from "./shared";
+import { EntityType } from "./shared";
 import { BlockFilter } from "./shared";
 import { Appointment } from "./appointment";
 import { ResultHeader } from "./shared";
@@ -87,6 +88,14 @@ export interface AppointmentByFilterQuery {
      * @generated from protobuf field: api.AppointmentQueryOptions Options = 7
      */
     Options?: AppointmentQueryOptions;
+    /**
+     * @generated from protobuf field: api.EntityType UsageContextEntity = 8
+     */
+    UsageContextEntity: EntityType;
+    /**
+     * @generated from protobuf field: string UsageContextPath = 9
+     */
+    UsageContextPath: string;
 }
 /**
  * @generated from protobuf message api.AppointmentByFilterResult
@@ -263,7 +272,9 @@ class AppointmentByFilterQuery$Type extends MessageType<AppointmentByFilterQuery
             { no: 4, name: "limitFilter", kind: "scalar", T: 9 /*ScalarType.STRING*/, options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Number of maximum result", example: "\"500\"" } } },
             { no: 5, name: "queryContext", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
             { 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: 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)" } } }
         ], { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_schema": { jsonSchema: { required: ["Header"] } } });
     }
     create(value?: PartialMessage<AppointmentByFilterQuery>): AppointmentByFilterQuery {
@@ -271,6 +282,8 @@ class AppointmentByFilterQuery$Type extends MessageType<AppointmentByFilterQuery
         message.limitFilter = "";
         message.queryContext = "";
         message.BlockFilters = [];
+        message.UsageContextEntity = 0;
+        message.UsageContextPath = "";
         if (value !== undefined)
             reflectionMergePartial<AppointmentByFilterQuery>(this, message, value);
         return message;
@@ -295,6 +308,12 @@ class AppointmentByFilterQuery$Type extends MessageType<AppointmentByFilterQuery
                 case /* api.AppointmentQueryOptions Options */ 7:
                     message.Options = AppointmentQueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.Options);
                     break;
+                case /* api.EntityType UsageContextEntity */ 8:
+                    message.UsageContextEntity = reader.int32();
+                    break;
+                case /* string UsageContextPath */ 9:
+                    message.UsageContextPath = reader.string();
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -322,6 +341,12 @@ class AppointmentByFilterQuery$Type extends MessageType<AppointmentByFilterQuery
         /* api.AppointmentQueryOptions Options = 7; */
         if (message.Options)
             AppointmentQueryOptions.internalBinaryWrite(message.Options, writer.tag(7, WireType.LengthDelimited).fork(), options).join();
+        /* api.EntityType UsageContextEntity = 8; */
+        if (message.UsageContextEntity !== 0)
+            writer.tag(8, WireType.Varint).int32(message.UsageContextEntity);
+        /* string UsageContextPath = 9; */
+        if (message.UsageContextPath !== "")
+            writer.tag(9, WireType.LengthDelimited).string(message.UsageContextPath);
         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 a147bb3..8dd2f6b 100644
--- a/claimQuery.ts
+++ b/claimQuery.ts
@@ -23,6 +23,7 @@ import { User } from "./user";
 import { RequestProjectHeader } from "./shared";
 import { MatchFieldResult } from "./shared";
 import { MatchField } from "./shared";
+import { EntityType } from "./shared";
 import { BlockFilter } from "./shared";
 import { Claim } from "./claim";
 import { ResultHeader } from "./shared";
@@ -89,6 +90,14 @@ export interface ClaimByFilterQuery {
      * @generated from protobuf field: api.ClaimQueryOptions Options = 7
      */
     Options?: ClaimQueryOptions;
+    /**
+     * @generated from protobuf field: api.EntityType UsageContextEntity = 8
+     */
+    UsageContextEntity: EntityType;
+    /**
+     * @generated from protobuf field: string UsageContextPath = 9
+     */
+    UsageContextPath: string;
 }
 /**
  * @generated from protobuf message api.ClaimByFilterResult
@@ -313,7 +322,9 @@ class ClaimByFilterQuery$Type extends MessageType<ClaimByFilterQuery> {
             { no: 4, name: "limitFilter", kind: "scalar", T: 9 /*ScalarType.STRING*/, options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Number of maximum result", example: "\"500\"" } } },
             { no: 5, name: "queryContext", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
             { 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: 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)" } } }
         ], { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_schema": { jsonSchema: { required: ["Header"] } } });
     }
     create(value?: PartialMessage<ClaimByFilterQuery>): ClaimByFilterQuery {
@@ -321,6 +332,8 @@ class ClaimByFilterQuery$Type extends MessageType<ClaimByFilterQuery> {
         message.limitFilter = "";
         message.queryContext = "";
         message.BlockFilters = [];
+        message.UsageContextEntity = 0;
+        message.UsageContextPath = "";
         if (value !== undefined)
             reflectionMergePartial<ClaimByFilterQuery>(this, message, value);
         return message;
@@ -345,6 +358,12 @@ class ClaimByFilterQuery$Type extends MessageType<ClaimByFilterQuery> {
                 case /* api.ClaimQueryOptions Options */ 7:
                     message.Options = ClaimQueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.Options);
                     break;
+                case /* api.EntityType UsageContextEntity */ 8:
+                    message.UsageContextEntity = reader.int32();
+                    break;
+                case /* string UsageContextPath */ 9:
+                    message.UsageContextPath = reader.string();
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -372,6 +391,12 @@ class ClaimByFilterQuery$Type extends MessageType<ClaimByFilterQuery> {
         /* api.ClaimQueryOptions Options = 7; */
         if (message.Options)
             ClaimQueryOptions.internalBinaryWrite(message.Options, writer.tag(7, WireType.LengthDelimited).fork(), options).join();
+        /* api.EntityType UsageContextEntity = 8; */
+        if (message.UsageContextEntity !== 0)
+            writer.tag(8, WireType.Varint).int32(message.UsageContextEntity);
+        /* string UsageContextPath = 9; */
+        if (message.UsageContextPath !== "")
+            writer.tag(9, WireType.LengthDelimited).string(message.UsageContextPath);
         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 9f2c121..908d2c2 100644
--- a/executionflowQuery.ts
+++ b/executionflowQuery.ts
@@ -15,6 +15,7 @@ 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 { EntityType } from "./shared";
 import { BlockFilter } from "./shared";
 import { Executionflow } from "./executionflow";
 import { ResultHeader } from "./shared";
@@ -81,6 +82,14 @@ export interface ExecutionflowByFilterQuery {
      * @generated from protobuf field: api.ExecutionflowQueryOptions Options = 7
      */
     Options?: ExecutionflowQueryOptions;
+    /**
+     * @generated from protobuf field: api.EntityType UsageContextEntity = 8
+     */
+    UsageContextEntity: EntityType;
+    /**
+     * @generated from protobuf field: string UsageContextPath = 9
+     */
+    UsageContextPath: string;
 }
 /**
  * @generated from protobuf message api.ExecutionflowByFilterResult
@@ -231,7 +240,9 @@ class ExecutionflowByFilterQuery$Type extends MessageType<ExecutionflowByFilterQ
             { no: 4, name: "limitFilter", kind: "scalar", T: 9 /*ScalarType.STRING*/, options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Number of maximum result", example: "\"500\"" } } },
             { no: 5, name: "queryContext", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
             { 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: 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)" } } }
         ], { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_schema": { jsonSchema: { required: ["Header"] } } });
     }
     create(value?: PartialMessage<ExecutionflowByFilterQuery>): ExecutionflowByFilterQuery {
@@ -239,6 +250,8 @@ class ExecutionflowByFilterQuery$Type extends MessageType<ExecutionflowByFilterQ
         message.limitFilter = "";
         message.queryContext = "";
         message.BlockFilters = [];
+        message.UsageContextEntity = 0;
+        message.UsageContextPath = "";
         if (value !== undefined)
             reflectionMergePartial<ExecutionflowByFilterQuery>(this, message, value);
         return message;
@@ -263,6 +276,12 @@ class ExecutionflowByFilterQuery$Type extends MessageType<ExecutionflowByFilterQ
                 case /* api.ExecutionflowQueryOptions Options */ 7:
                     message.Options = ExecutionflowQueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.Options);
                     break;
+                case /* api.EntityType UsageContextEntity */ 8:
+                    message.UsageContextEntity = reader.int32();
+                    break;
+                case /* string UsageContextPath */ 9:
+                    message.UsageContextPath = reader.string();
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -290,6 +309,12 @@ class ExecutionflowByFilterQuery$Type extends MessageType<ExecutionflowByFilterQ
         /* api.ExecutionflowQueryOptions Options = 7; */
         if (message.Options)
             ExecutionflowQueryOptions.internalBinaryWrite(message.Options, writer.tag(7, WireType.LengthDelimited).fork(), options).join();
+        /* api.EntityType UsageContextEntity = 8; */
+        if (message.UsageContextEntity !== 0)
+            writer.tag(8, WireType.Varint).int32(message.UsageContextEntity);
+        /* string UsageContextPath = 9; */
+        if (message.UsageContextPath !== "")
+            writer.tag(9, WireType.LengthDelimited).string(message.UsageContextPath);
         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 47efc4c..54360ca 100644
--- a/handlingunitQuery.ts
+++ b/handlingunitQuery.ts
@@ -21,6 +21,7 @@ import { reflectionMergePartial } from "@protobuf-ts/runtime";
 import { MessageType } from "@protobuf-ts/runtime";
 import { MatchFieldResult } from "./shared";
 import { MatchField } from "./shared";
+import { EntityType } from "./shared";
 import { BlockFilter } from "./shared";
 import { Handlingunit } from "./handlingunit";
 import { ResultHeader } from "./shared";
@@ -85,6 +86,14 @@ export interface HandlingunitByFilterQuery {
      * @generated from protobuf field: api.HandlingunitQueryOptions Options = 8
      */
     Options?: HandlingunitQueryOptions;
+    /**
+     * @generated from protobuf field: api.EntityType UsageContextEntity = 9
+     */
+    UsageContextEntity: EntityType;
+    /**
+     * @generated from protobuf field: string UsageContextPath = 10
+     */
+    UsageContextPath: string;
 }
 /**
  * @generated from protobuf message api.HandlingunitByFilterResult
@@ -261,7 +270,9 @@ class HandlingunitByFilterQuery$Type extends MessageType<HandlingunitByFilterQue
             { no: 4, name: "limitFilter", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
             { no: 5, name: "queryContext", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
             { 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: 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)" } } }
         ]);
     }
     create(value?: PartialMessage<HandlingunitByFilterQuery>): HandlingunitByFilterQuery {
@@ -269,6 +280,8 @@ class HandlingunitByFilterQuery$Type extends MessageType<HandlingunitByFilterQue
         message.limitFilter = "";
         message.queryContext = "";
         message.BlockFilters = [];
+        message.UsageContextEntity = 0;
+        message.UsageContextPath = "";
         if (value !== undefined)
             reflectionMergePartial<HandlingunitByFilterQuery>(this, message, value);
         return message;
@@ -293,6 +306,12 @@ class HandlingunitByFilterQuery$Type extends MessageType<HandlingunitByFilterQue
                 case /* api.HandlingunitQueryOptions Options */ 8:
                     message.Options = HandlingunitQueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.Options);
                     break;
+                case /* api.EntityType UsageContextEntity */ 9:
+                    message.UsageContextEntity = reader.int32();
+                    break;
+                case /* string UsageContextPath */ 10:
+                    message.UsageContextPath = reader.string();
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -320,6 +339,12 @@ class HandlingunitByFilterQuery$Type extends MessageType<HandlingunitByFilterQue
         /* api.HandlingunitQueryOptions Options = 8; */
         if (message.Options)
             HandlingunitQueryOptions.internalBinaryWrite(message.Options, writer.tag(8, WireType.LengthDelimited).fork(), options).join();
+        /* api.EntityType UsageContextEntity = 9; */
+        if (message.UsageContextEntity !== 0)
+            writer.tag(9, WireType.Varint).int32(message.UsageContextEntity);
+        /* string UsageContextPath = 10; */
+        if (message.UsageContextPath !== "")
+            writer.tag(10, WireType.LengthDelimited).string(message.UsageContextPath);
         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 439abe9..141d0e1 100644
--- a/itemQuery.ts
+++ b/itemQuery.ts
@@ -20,6 +20,7 @@ import { MessageType } from "@protobuf-ts/runtime";
 import { LVDetailedQuantity } from "./repositoryShared";
 import { MatchFieldResult } from "./shared";
 import { MatchField } from "./shared";
+import { EntityType } from "./shared";
 import { BlockFilter } from "./shared";
 import { Item } from "./item";
 import { ResultHeader } from "./shared";
@@ -88,6 +89,14 @@ export interface ItemByFilterQuery {
      * @generated from protobuf field: api.ItemQueryOptions Options = 7
      */
     Options?: ItemQueryOptions;
+    /**
+     * @generated from protobuf field: api.EntityType UsageContextEntity = 8
+     */
+    UsageContextEntity: EntityType;
+    /**
+     * @generated from protobuf field: string UsageContextPath = 9
+     */
+    UsageContextPath: string;
 }
 /**
  * @generated from protobuf message api.ItemByFilterResult
@@ -298,7 +307,9 @@ class ItemByFilterQuery$Type extends MessageType<ItemByFilterQuery> {
             { no: 4, name: "limitFilter", kind: "scalar", T: 9 /*ScalarType.STRING*/, options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Number of maximum result", example: "\"500\"" } } },
             { no: 5, name: "queryContext", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
             { 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: 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)" } } }
         ], { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_schema": { jsonSchema: { required: ["Header"] } } });
     }
     create(value?: PartialMessage<ItemByFilterQuery>): ItemByFilterQuery {
@@ -306,6 +317,8 @@ class ItemByFilterQuery$Type extends MessageType<ItemByFilterQuery> {
         message.limitFilter = "";
         message.queryContext = "";
         message.BlockFilters = [];
+        message.UsageContextEntity = 0;
+        message.UsageContextPath = "";
         if (value !== undefined)
             reflectionMergePartial<ItemByFilterQuery>(this, message, value);
         return message;
@@ -330,6 +343,12 @@ class ItemByFilterQuery$Type extends MessageType<ItemByFilterQuery> {
                 case /* api.ItemQueryOptions Options */ 7:
                     message.Options = ItemQueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.Options);
                     break;
+                case /* api.EntityType UsageContextEntity */ 8:
+                    message.UsageContextEntity = reader.int32();
+                    break;
+                case /* string UsageContextPath */ 9:
+                    message.UsageContextPath = reader.string();
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -357,6 +376,12 @@ class ItemByFilterQuery$Type extends MessageType<ItemByFilterQuery> {
         /* api.ItemQueryOptions Options = 7; */
         if (message.Options)
             ItemQueryOptions.internalBinaryWrite(message.Options, writer.tag(7, WireType.LengthDelimited).fork(), options).join();
+        /* api.EntityType UsageContextEntity = 8; */
+        if (message.UsageContextEntity !== 0)
+            writer.tag(8, WireType.Varint).int32(message.UsageContextEntity);
+        /* string UsageContextPath = 9; */
+        if (message.UsageContextPath !== "")
+            writer.tag(9, WireType.LengthDelimited).string(message.UsageContextPath);
         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 a0a604c..b6e7f46 100644
--- a/movementQuery.ts
+++ b/movementQuery.ts
@@ -21,6 +21,7 @@ import { reflectionMergePartial } from "@protobuf-ts/runtime";
 import { MessageType } from "@protobuf-ts/runtime";
 import { MatchFieldResult } from "./shared";
 import { MatchField } from "./shared";
+import { EntityType } from "./shared";
 import { BlockFilter } from "./shared";
 import { Movement } from "./movement";
 import { ResultHeader } from "./shared";
@@ -87,6 +88,14 @@ export interface MovementByFilterQuery {
      * @generated from protobuf field: api.MovementQueryOptions Options = 8
      */
     Options?: MovementQueryOptions;
+    /**
+     * @generated from protobuf field: api.EntityType UsageContextEntity = 9
+     */
+    UsageContextEntity: EntityType;
+    /**
+     * @generated from protobuf field: string UsageContextPath = 10
+     */
+    UsageContextPath: string;
 }
 /**
  * @generated from protobuf message api.MovementByFilterResult
@@ -293,7 +302,9 @@ class MovementByFilterQuery$Type extends MessageType<MovementByFilterQuery> {
             { no: 4, name: "limitFilter", kind: "scalar", T: 9 /*ScalarType.STRING*/, options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Number of maximum result", example: "\"500\"" } } },
             { no: 5, name: "queryContext", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
             { 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: 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)" } } }
         ], { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_schema": { jsonSchema: { required: ["Header"] } } });
     }
     create(value?: PartialMessage<MovementByFilterQuery>): MovementByFilterQuery {
@@ -301,6 +312,8 @@ class MovementByFilterQuery$Type extends MessageType<MovementByFilterQuery> {
         message.limitFilter = "";
         message.queryContext = "";
         message.BlockFilters = [];
+        message.UsageContextEntity = 0;
+        message.UsageContextPath = "";
         if (value !== undefined)
             reflectionMergePartial<MovementByFilterQuery>(this, message, value);
         return message;
@@ -325,6 +338,12 @@ class MovementByFilterQuery$Type extends MessageType<MovementByFilterQuery> {
                 case /* api.MovementQueryOptions Options */ 8:
                     message.Options = MovementQueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.Options);
                     break;
+                case /* api.EntityType UsageContextEntity */ 9:
+                    message.UsageContextEntity = reader.int32();
+                    break;
+                case /* string UsageContextPath */ 10:
+                    message.UsageContextPath = reader.string();
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -352,6 +371,12 @@ class MovementByFilterQuery$Type extends MessageType<MovementByFilterQuery> {
         /* api.MovementQueryOptions Options = 8; */
         if (message.Options)
             MovementQueryOptions.internalBinaryWrite(message.Options, writer.tag(8, WireType.LengthDelimited).fork(), options).join();
+        /* api.EntityType UsageContextEntity = 9; */
+        if (message.UsageContextEntity !== 0)
+            writer.tag(9, WireType.Varint).int32(message.UsageContextEntity);
+        /* string UsageContextPath = 10; */
+        if (message.UsageContextPath !== "")
+            writer.tag(10, WireType.LengthDelimited).string(message.UsageContextPath);
         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 3ec75c9..57f1b94 100644
--- a/orderQuery.ts
+++ b/orderQuery.ts
@@ -19,6 +19,7 @@ import { reflectionMergePartial } from "@protobuf-ts/runtime";
 import { MessageType } from "@protobuf-ts/runtime";
 import { MatchFieldResult } from "./shared";
 import { MatchField } from "./shared";
+import { EntityType } from "./shared";
 import { BlockFilter } from "./shared";
 import { Order } from "./order";
 import { ResultHeader } from "./shared";
@@ -85,6 +86,14 @@ export interface OrderByFilterQuery {
      * @generated from protobuf field: api.OrderQueryOptions Options = 7
      */
     Options?: OrderQueryOptions;
+    /**
+     * @generated from protobuf field: api.EntityType UsageContextEntity = 8
+     */
+    UsageContextEntity: EntityType;
+    /**
+     * @generated from protobuf field: string UsageContextPath = 9
+     */
+    UsageContextPath: string;
 }
 /**
  * @generated from protobuf message api.OrderByFilterResult
@@ -265,7 +274,9 @@ class OrderByFilterQuery$Type extends MessageType<OrderByFilterQuery> {
             { no: 4, name: "limitFilter", kind: "scalar", T: 9 /*ScalarType.STRING*/, options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Number of maximum result", example: "\"500\"" } } },
             { no: 5, name: "queryContext", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
             { 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: 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)" } } }
         ], { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_schema": { jsonSchema: { required: ["Header"] } } });
     }
     create(value?: PartialMessage<OrderByFilterQuery>): OrderByFilterQuery {
@@ -273,6 +284,8 @@ class OrderByFilterQuery$Type extends MessageType<OrderByFilterQuery> {
         message.limitFilter = "";
         message.queryContext = "";
         message.BlockFilters = [];
+        message.UsageContextEntity = 0;
+        message.UsageContextPath = "";
         if (value !== undefined)
             reflectionMergePartial<OrderByFilterQuery>(this, message, value);
         return message;
@@ -297,6 +310,12 @@ class OrderByFilterQuery$Type extends MessageType<OrderByFilterQuery> {
                 case /* api.OrderQueryOptions Options */ 7:
                     message.Options = OrderQueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.Options);
                     break;
+                case /* api.EntityType UsageContextEntity */ 8:
+                    message.UsageContextEntity = reader.int32();
+                    break;
+                case /* string UsageContextPath */ 9:
+                    message.UsageContextPath = reader.string();
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -324,6 +343,12 @@ class OrderByFilterQuery$Type extends MessageType<OrderByFilterQuery> {
         /* api.OrderQueryOptions Options = 7; */
         if (message.Options)
             OrderQueryOptions.internalBinaryWrite(message.Options, writer.tag(7, WireType.LengthDelimited).fork(), options).join();
+        /* api.EntityType UsageContextEntity = 8; */
+        if (message.UsageContextEntity !== 0)
+            writer.tag(8, WireType.Varint).int32(message.UsageContextEntity);
+        /* string UsageContextPath = 9; */
+        if (message.UsageContextPath !== "")
+            writer.tag(9, WireType.LengthDelimited).string(message.UsageContextPath);
         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 1f80663..0d6d101 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@reflex-platform/npm-core-sdk",
-  "version": "1.12.0-SNAPSHOT-250925081441",
+  "version": "1.12.0-SNAPSHOT-250925143341",
   "description": "npm libs from core model proto files",
   "homepage": "",
   "main": "index.ts",
diff --git a/partnerQuery.ts b/partnerQuery.ts
index 249776f..fd93824 100644
--- a/partnerQuery.ts
+++ b/partnerQuery.ts
@@ -19,6 +19,7 @@ import { reflectionMergePartial } from "@protobuf-ts/runtime";
 import { MessageType } from "@protobuf-ts/runtime";
 import { MatchFieldResult } from "./shared";
 import { MatchField } from "./shared";
+import { EntityType } from "./shared";
 import { BlockFilter } from "./shared";
 import { Partner } from "./partner";
 import { ResultHeader } from "./shared";
@@ -85,6 +86,14 @@ export interface PartnerByFilterQuery {
      * @generated from protobuf field: api.PartnerQueryOptions Options = 7
      */
     Options?: PartnerQueryOptions;
+    /**
+     * @generated from protobuf field: api.EntityType UsageContextEntity = 8
+     */
+    UsageContextEntity: EntityType;
+    /**
+     * @generated from protobuf field: string UsageContextPath = 9
+     */
+    UsageContextPath: string;
 }
 /**
  * @generated from protobuf message api.PartnerByFilterResult
@@ -261,7 +270,9 @@ class PartnerByFilterQuery$Type extends MessageType<PartnerByFilterQuery> {
             { no: 4, name: "limitFilter", kind: "scalar", T: 9 /*ScalarType.STRING*/, options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Number of maximum result", example: "\"500\"" } } },
             { no: 5, name: "queryContext", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
             { 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: 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)" } } }
         ], { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_schema": { jsonSchema: { required: ["Header"] } } });
     }
     create(value?: PartialMessage<PartnerByFilterQuery>): PartnerByFilterQuery {
@@ -269,6 +280,8 @@ class PartnerByFilterQuery$Type extends MessageType<PartnerByFilterQuery> {
         message.limitFilter = "";
         message.queryContext = "";
         message.BlockFilters = [];
+        message.UsageContextEntity = 0;
+        message.UsageContextPath = "";
         if (value !== undefined)
             reflectionMergePartial<PartnerByFilterQuery>(this, message, value);
         return message;
@@ -293,6 +306,12 @@ class PartnerByFilterQuery$Type extends MessageType<PartnerByFilterQuery> {
                 case /* api.PartnerQueryOptions Options */ 7:
                     message.Options = PartnerQueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.Options);
                     break;
+                case /* api.EntityType UsageContextEntity */ 8:
+                    message.UsageContextEntity = reader.int32();
+                    break;
+                case /* string UsageContextPath */ 9:
+                    message.UsageContextPath = reader.string();
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -320,6 +339,12 @@ class PartnerByFilterQuery$Type extends MessageType<PartnerByFilterQuery> {
         /* api.PartnerQueryOptions Options = 7; */
         if (message.Options)
             PartnerQueryOptions.internalBinaryWrite(message.Options, writer.tag(7, WireType.LengthDelimited).fork(), options).join();
+        /* api.EntityType UsageContextEntity = 8; */
+        if (message.UsageContextEntity !== 0)
+            writer.tag(8, WireType.Varint).int32(message.UsageContextEntity);
+        /* string UsageContextPath = 9; */
+        if (message.UsageContextPath !== "")
+            writer.tag(9, WireType.LengthDelimited).string(message.UsageContextPath);
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
diff --git a/stockQuery.ts b/stockQuery.ts
index 52c5c09..7de95bb 100644
--- a/stockQuery.ts
+++ b/stockQuery.ts
@@ -24,6 +24,7 @@ import { reflectionMergePartial } from "@protobuf-ts/runtime";
 import { MessageType } from "@protobuf-ts/runtime";
 import { MatchFieldResult } from "./shared";
 import { MatchField } from "./shared";
+import { EntityType } from "./shared";
 import { BlockFilter } from "./shared";
 import { Stock } from "./stock";
 import { ResultHeader } from "./shared";
@@ -90,6 +91,14 @@ export interface StockByFilterQuery {
      * @generated from protobuf field: api.StockQueryOptions Options = 8
      */
     Options?: StockQueryOptions;
+    /**
+     * @generated from protobuf field: api.EntityType UsageContextEntity = 9
+     */
+    UsageContextEntity: EntityType;
+    /**
+     * @generated from protobuf field: string UsageContextPath = 10
+     */
+    UsageContextPath: string;
 }
 /**
  * @generated from protobuf message api.StockByFilterResult
@@ -270,7 +279,9 @@ class StockByFilterQuery$Type extends MessageType<StockByFilterQuery> {
             { no: 4, name: "limitFilter", kind: "scalar", T: 9 /*ScalarType.STRING*/, options: { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field": { description: "Number of maximum result", example: "\"500\"" } } },
             { no: 5, name: "queryContext", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
             { 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: 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)" } } }
         ], { "grpc.gateway.protoc_gen_openapiv2.options.openapiv2_schema": { jsonSchema: { required: ["Header"] } } });
     }
     create(value?: PartialMessage<StockByFilterQuery>): StockByFilterQuery {
@@ -278,6 +289,8 @@ class StockByFilterQuery$Type extends MessageType<StockByFilterQuery> {
         message.limitFilter = "";
         message.queryContext = "";
         message.BlockFilters = [];
+        message.UsageContextEntity = 0;
+        message.UsageContextPath = "";
         if (value !== undefined)
             reflectionMergePartial<StockByFilterQuery>(this, message, value);
         return message;
@@ -302,6 +315,12 @@ class StockByFilterQuery$Type extends MessageType<StockByFilterQuery> {
                 case /* api.StockQueryOptions Options */ 8:
                     message.Options = StockQueryOptions.internalBinaryRead(reader, reader.uint32(), options, message.Options);
                     break;
+                case /* api.EntityType UsageContextEntity */ 9:
+                    message.UsageContextEntity = reader.int32();
+                    break;
+                case /* string UsageContextPath */ 10:
+                    message.UsageContextPath = reader.string();
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -329,6 +348,12 @@ class StockByFilterQuery$Type extends MessageType<StockByFilterQuery> {
         /* api.StockQueryOptions Options = 8; */
         if (message.Options)
             StockQueryOptions.internalBinaryWrite(message.Options, writer.tag(8, WireType.LengthDelimited).fork(), options).join();
+        /* api.EntityType UsageContextEntity = 9; */
+        if (message.UsageContextEntity !== 0)
+            writer.tag(9, WireType.Varint).int32(message.UsageContextEntity);
+        /* string UsageContextPath = 10; */
+        if (message.UsageContextPath !== "")
+            writer.tag(10, WireType.LengthDelimited).string(message.UsageContextPath);
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);