diff --git a/CHANGELOG.md b/CHANGELOG.md
index 06a6a179..de84c1a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,3 @@
 # CHANGELOG
 
-Lib version: 1.12.0-SNAPSHOT-250925081438
+Lib version: 1.12.0-SNAPSHOT-250925143331
diff --git a/lib/actorQuery.pb.dart b/lib/actorQuery.pb.dart
index bce08f06..9f2e6530 100644
--- a/lib/actorQuery.pb.dart
+++ b/lib/actorQuery.pb.dart
@@ -148,6 +148,8 @@ class ActorByFilterQuery extends $pb.GeneratedMessage {
     $core.String? queryContext,
     $core.Iterable<$1.BlockFilter>? blockFilters,
     ActorQueryOptions? options,
+    $1.EntityType? usageContextEntity,
+    $core.String? usageContextPath,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -155,6 +157,8 @@ class ActorByFilterQuery extends $pb.GeneratedMessage {
     if (queryContext != null) result.queryContext = queryContext;
     if (blockFilters != null) result.blockFilters.addAll(blockFilters);
     if (options != null) result.options = options;
+    if (usageContextEntity != null) result.usageContextEntity = usageContextEntity;
+    if (usageContextPath != null) result.usageContextPath = usageContextPath;
     return result;
   }
 
@@ -169,6 +173,8 @@ class ActorByFilterQuery extends $pb.GeneratedMessage {
     ..aOS(5, _omitFieldNames ? '' : 'queryContext', protoName: 'queryContext')
     ..pc<$1.BlockFilter>(6, _omitFieldNames ? '' : 'BlockFilters', $pb.PbFieldType.PM, protoName: 'BlockFilters', subBuilder: $1.BlockFilter.create)
     ..aOM<ActorQueryOptions>(7, _omitFieldNames ? '' : 'Options', protoName: 'Options', subBuilder: ActorQueryOptions.create)
+    ..e<$1.EntityType>(8, _omitFieldNames ? '' : 'UsageContextEntity', $pb.PbFieldType.OE, protoName: 'UsageContextEntity', defaultOrMaker: $1.EntityType.ENTITY_TYPE_UNKNOWN, valueOf: $1.EntityType.valueOf, enumValues: $1.EntityType.values)
+    ..aOS(9, _omitFieldNames ? '' : 'UsageContextPath', protoName: 'UsageContextPath')
     ..hasRequiredFields = false
   ;
 
@@ -233,6 +239,24 @@ class ActorByFilterQuery extends $pb.GeneratedMessage {
   void clearOptions() => $_clearField(7);
   @$pb.TagNumber(7)
   ActorQueryOptions ensureOptions() => $_ensure(4);
+
+  @$pb.TagNumber(8)
+  $1.EntityType get usageContextEntity => $_getN(5);
+  @$pb.TagNumber(8)
+  set usageContextEntity($1.EntityType value) => $_setField(8, value);
+  @$pb.TagNumber(8)
+  $core.bool hasUsageContextEntity() => $_has(5);
+  @$pb.TagNumber(8)
+  void clearUsageContextEntity() => $_clearField(8);
+
+  @$pb.TagNumber(9)
+  $core.String get usageContextPath => $_getSZ(6);
+  @$pb.TagNumber(9)
+  set usageContextPath($core.String value) => $_setString(6, value);
+  @$pb.TagNumber(9)
+  $core.bool hasUsageContextPath() => $_has(6);
+  @$pb.TagNumber(9)
+  void clearUsageContextPath() => $_clearField(9);
 }
 
 class ActorByFilterResult extends $pb.GeneratedMessage {
diff --git a/lib/actorQuery.pbjson.dart b/lib/actorQuery.pbjson.dart
index 2cd91e1f..a8d45762 100644
--- a/lib/actorQuery.pbjson.dart
+++ b/lib/actorQuery.pbjson.dart
@@ -57,6 +57,8 @@ const ActorByFilterQuery$json = {
     {'1': 'queryContext', '3': 5, '4': 1, '5': 9, '10': 'queryContext'},
     {'1': 'BlockFilters', '3': 6, '4': 3, '5': 11, '6': '.api.BlockFilter', '10': 'BlockFilters'},
     {'1': 'Options', '3': 7, '4': 1, '5': 11, '6': '.api.ActorQueryOptions', '10': 'Options'},
+    {'1': 'UsageContextEntity', '3': 8, '4': 1, '5': 14, '6': '.api.EntityType', '8': {}, '10': 'UsageContextEntity'},
+    {'1': 'UsageContextPath', '3': 9, '4': 1, '5': 9, '8': {}, '10': 'UsageContextPath'},
   ],
   '7': {},
 };
@@ -68,7 +70,15 @@ final $typed_data.Uint8List actorByFilterQueryDescriptor = $convert.base64Decode
     'dW1iZXIgb2YgbWF4aW11bSByZXN1bHRKBSI1MDAiUgtsaW1pdEZpbHRlchIiCgxxdWVyeUNvbn'
     'RleHQYBSABKAlSDHF1ZXJ5Q29udGV4dBI0CgxCbG9ja0ZpbHRlcnMYBiADKAsyEC5hcGkuQmxv'
     'Y2tGaWx0ZXJSDEJsb2NrRmlsdGVycxIwCgdPcHRpb25zGAcgASgLMhYuYXBpLkFjdG9yUXVlcn'
-    'lPcHRpb25zUgdPcHRpb25zOg6SQQsKCdIBBkhlYWRlcg==');
+    'lPcHRpb25zUgdPcHRpb25zEsACChJVc2FnZUNvbnRleHRFbnRpdHkYCCABKA4yDy5hcGkuRW50'
+    'aXR5VHlwZUL+AZJB+gEyW09wdGlvbmFsIDogRW50aXR5IHRvIGFwcGx5IHRoZSByZXN0cmljdG'
+    'lvbiBydWxlcyAob24gdGhlIHBhdGggZGVmaW5lZCB3aXRoIFVzYWdlQ29udGV4dFBhdGhKmgFG'
+    'b3IgQWN0b3IsIHRvIGxpbWl0IHRoZSByZXN1bHRzIGFjY29yZGluZyB0byBPcmRlciBTaGlwRn'
+    'JvbSByZXN0cmljdGlvbiBydWxlcywgZGVmaW5lIFVzYWdlQ29udGV4dEVudGl0eSB0byBPcmRl'
+    'ciBhbmQgVXNhZ2VDb250ZXh0UGF0aCB0byBQYXlsb2FkLlNoaXBGcm9tUhJVc2FnZUNvbnRleH'
+    'RFbnRpdHkShAEKEFVzYWdlQ29udGV4dFBhdGgYCSABKAlCWJJBVTJTT3B0aW9uYWwgOiBQYXRo'
+    'IG9mIHJlc3RyaWN0aW9uIHJ1bGUgdG8gYXBwbHkgKFVzYWdlQ29udGV4dEVudGl0eSBzaG91bG'
+    'QgYmUgZGVmaW5lZClSEFVzYWdlQ29udGV4dFBhdGg6DpJBCwoJ0gEGSGVhZGVy');
 
 @$core.Deprecated('Use actorByFilterResultDescriptor instead')
 const ActorByFilterResult$json = {
diff --git a/lib/appointmentQuery.pb.dart b/lib/appointmentQuery.pb.dart
index e6ad1a45..55ae73cc 100644
--- a/lib/appointmentQuery.pb.dart
+++ b/lib/appointmentQuery.pb.dart
@@ -148,6 +148,8 @@ class AppointmentByFilterQuery extends $pb.GeneratedMessage {
     $core.String? queryContext,
     $core.Iterable<$1.BlockFilter>? blockFilters,
     AppointmentQueryOptions? options,
+    $1.EntityType? usageContextEntity,
+    $core.String? usageContextPath,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -155,6 +157,8 @@ class AppointmentByFilterQuery extends $pb.GeneratedMessage {
     if (queryContext != null) result.queryContext = queryContext;
     if (blockFilters != null) result.blockFilters.addAll(blockFilters);
     if (options != null) result.options = options;
+    if (usageContextEntity != null) result.usageContextEntity = usageContextEntity;
+    if (usageContextPath != null) result.usageContextPath = usageContextPath;
     return result;
   }
 
@@ -169,6 +173,8 @@ class AppointmentByFilterQuery extends $pb.GeneratedMessage {
     ..aOS(5, _omitFieldNames ? '' : 'queryContext', protoName: 'queryContext')
     ..pc<$1.BlockFilter>(6, _omitFieldNames ? '' : 'BlockFilters', $pb.PbFieldType.PM, protoName: 'BlockFilters', subBuilder: $1.BlockFilter.create)
     ..aOM<AppointmentQueryOptions>(7, _omitFieldNames ? '' : 'Options', protoName: 'Options', subBuilder: AppointmentQueryOptions.create)
+    ..e<$1.EntityType>(8, _omitFieldNames ? '' : 'UsageContextEntity', $pb.PbFieldType.OE, protoName: 'UsageContextEntity', defaultOrMaker: $1.EntityType.ENTITY_TYPE_UNKNOWN, valueOf: $1.EntityType.valueOf, enumValues: $1.EntityType.values)
+    ..aOS(9, _omitFieldNames ? '' : 'UsageContextPath', protoName: 'UsageContextPath')
     ..hasRequiredFields = false
   ;
 
@@ -233,6 +239,24 @@ class AppointmentByFilterQuery extends $pb.GeneratedMessage {
   void clearOptions() => $_clearField(7);
   @$pb.TagNumber(7)
   AppointmentQueryOptions ensureOptions() => $_ensure(4);
+
+  @$pb.TagNumber(8)
+  $1.EntityType get usageContextEntity => $_getN(5);
+  @$pb.TagNumber(8)
+  set usageContextEntity($1.EntityType value) => $_setField(8, value);
+  @$pb.TagNumber(8)
+  $core.bool hasUsageContextEntity() => $_has(5);
+  @$pb.TagNumber(8)
+  void clearUsageContextEntity() => $_clearField(8);
+
+  @$pb.TagNumber(9)
+  $core.String get usageContextPath => $_getSZ(6);
+  @$pb.TagNumber(9)
+  set usageContextPath($core.String value) => $_setString(6, value);
+  @$pb.TagNumber(9)
+  $core.bool hasUsageContextPath() => $_has(6);
+  @$pb.TagNumber(9)
+  void clearUsageContextPath() => $_clearField(9);
 }
 
 class AppointmentByFilterResult extends $pb.GeneratedMessage {
diff --git a/lib/appointmentQuery.pbjson.dart b/lib/appointmentQuery.pbjson.dart
index e0dc7074..83b1dd82 100644
--- a/lib/appointmentQuery.pbjson.dart
+++ b/lib/appointmentQuery.pbjson.dart
@@ -57,6 +57,8 @@ const AppointmentByFilterQuery$json = {
     {'1': 'queryContext', '3': 5, '4': 1, '5': 9, '10': 'queryContext'},
     {'1': 'BlockFilters', '3': 6, '4': 3, '5': 11, '6': '.api.BlockFilter', '10': 'BlockFilters'},
     {'1': 'Options', '3': 7, '4': 1, '5': 11, '6': '.api.AppointmentQueryOptions', '10': 'Options'},
+    {'1': 'UsageContextEntity', '3': 8, '4': 1, '5': 14, '6': '.api.EntityType', '8': {}, '10': 'UsageContextEntity'},
+    {'1': 'UsageContextPath', '3': 9, '4': 1, '5': 9, '8': {}, '10': 'UsageContextPath'},
   ],
   '7': {},
 };
@@ -68,7 +70,15 @@ final $typed_data.Uint8List appointmentByFilterQueryDescriptor = $convert.base64
     'MhhOdW1iZXIgb2YgbWF4aW11bSByZXN1bHRKBSI1MDAiUgtsaW1pdEZpbHRlchIiCgxxdWVyeU'
     'NvbnRleHQYBSABKAlSDHF1ZXJ5Q29udGV4dBI0CgxCbG9ja0ZpbHRlcnMYBiADKAsyEC5hcGku'
     'QmxvY2tGaWx0ZXJSDEJsb2NrRmlsdGVycxI2CgdPcHRpb25zGAcgASgLMhwuYXBpLkFwcG9pbn'
-    'RtZW50UXVlcnlPcHRpb25zUgdPcHRpb25zOg6SQQsKCdIBBkhlYWRlcg==');
+    'RtZW50UXVlcnlPcHRpb25zUgdPcHRpb25zEsACChJVc2FnZUNvbnRleHRFbnRpdHkYCCABKA4y'
+    'Dy5hcGkuRW50aXR5VHlwZUL+AZJB+gEyW09wdGlvbmFsIDogRW50aXR5IHRvIGFwcGx5IHRoZS'
+    'ByZXN0cmljdGlvbiBydWxlcyAob24gdGhlIHBhdGggZGVmaW5lZCB3aXRoIFVzYWdlQ29udGV4'
+    'dFBhdGhKmgFGb3IgQWN0b3IsIHRvIGxpbWl0IHRoZSByZXN1bHRzIGFjY29yZGluZyB0byBPcm'
+    'RlciBTaGlwRnJvbSByZXN0cmljdGlvbiBydWxlcywgZGVmaW5lIFVzYWdlQ29udGV4dEVudGl0'
+    'eSB0byBPcmRlciBhbmQgVXNhZ2VDb250ZXh0UGF0aCB0byBQYXlsb2FkLlNoaXBGcm9tUhJVc2'
+    'FnZUNvbnRleHRFbnRpdHkShAEKEFVzYWdlQ29udGV4dFBhdGgYCSABKAlCWJJBVTJTT3B0aW9u'
+    'YWwgOiBQYXRoIG9mIHJlc3RyaWN0aW9uIHJ1bGUgdG8gYXBwbHkgKFVzYWdlQ29udGV4dEVudG'
+    'l0eSBzaG91bGQgYmUgZGVmaW5lZClSEFVzYWdlQ29udGV4dFBhdGg6DpJBCwoJ0gEGSGVhZGVy');
 
 @$core.Deprecated('Use appointmentByFilterResultDescriptor instead')
 const AppointmentByFilterResult$json = {
diff --git a/lib/claimQuery.pb.dart b/lib/claimQuery.pb.dart
index ee78647a..ab5961c6 100644
--- a/lib/claimQuery.pb.dart
+++ b/lib/claimQuery.pb.dart
@@ -149,6 +149,8 @@ class ClaimByFilterQuery extends $pb.GeneratedMessage {
     $core.String? queryContext,
     $core.Iterable<$1.BlockFilter>? blockFilters,
     ClaimQueryOptions? options,
+    $1.EntityType? usageContextEntity,
+    $core.String? usageContextPath,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -156,6 +158,8 @@ class ClaimByFilterQuery extends $pb.GeneratedMessage {
     if (queryContext != null) result.queryContext = queryContext;
     if (blockFilters != null) result.blockFilters.addAll(blockFilters);
     if (options != null) result.options = options;
+    if (usageContextEntity != null) result.usageContextEntity = usageContextEntity;
+    if (usageContextPath != null) result.usageContextPath = usageContextPath;
     return result;
   }
 
@@ -170,6 +174,8 @@ class ClaimByFilterQuery extends $pb.GeneratedMessage {
     ..aOS(5, _omitFieldNames ? '' : 'queryContext', protoName: 'queryContext')
     ..pc<$1.BlockFilter>(6, _omitFieldNames ? '' : 'BlockFilters', $pb.PbFieldType.PM, protoName: 'BlockFilters', subBuilder: $1.BlockFilter.create)
     ..aOM<ClaimQueryOptions>(7, _omitFieldNames ? '' : 'Options', protoName: 'Options', subBuilder: ClaimQueryOptions.create)
+    ..e<$1.EntityType>(8, _omitFieldNames ? '' : 'UsageContextEntity', $pb.PbFieldType.OE, protoName: 'UsageContextEntity', defaultOrMaker: $1.EntityType.ENTITY_TYPE_UNKNOWN, valueOf: $1.EntityType.valueOf, enumValues: $1.EntityType.values)
+    ..aOS(9, _omitFieldNames ? '' : 'UsageContextPath', protoName: 'UsageContextPath')
     ..hasRequiredFields = false
   ;
 
@@ -234,6 +240,24 @@ class ClaimByFilterQuery extends $pb.GeneratedMessage {
   void clearOptions() => $_clearField(7);
   @$pb.TagNumber(7)
   ClaimQueryOptions ensureOptions() => $_ensure(4);
+
+  @$pb.TagNumber(8)
+  $1.EntityType get usageContextEntity => $_getN(5);
+  @$pb.TagNumber(8)
+  set usageContextEntity($1.EntityType value) => $_setField(8, value);
+  @$pb.TagNumber(8)
+  $core.bool hasUsageContextEntity() => $_has(5);
+  @$pb.TagNumber(8)
+  void clearUsageContextEntity() => $_clearField(8);
+
+  @$pb.TagNumber(9)
+  $core.String get usageContextPath => $_getSZ(6);
+  @$pb.TagNumber(9)
+  set usageContextPath($core.String value) => $_setString(6, value);
+  @$pb.TagNumber(9)
+  $core.bool hasUsageContextPath() => $_has(6);
+  @$pb.TagNumber(9)
+  void clearUsageContextPath() => $_clearField(9);
 }
 
 class ClaimByFilterResult extends $pb.GeneratedMessage {
diff --git a/lib/claimQuery.pbjson.dart b/lib/claimQuery.pbjson.dart
index 4cdd7616..3179eed2 100644
--- a/lib/claimQuery.pbjson.dart
+++ b/lib/claimQuery.pbjson.dart
@@ -57,6 +57,8 @@ const ClaimByFilterQuery$json = {
     {'1': 'queryContext', '3': 5, '4': 1, '5': 9, '10': 'queryContext'},
     {'1': 'BlockFilters', '3': 6, '4': 3, '5': 11, '6': '.api.BlockFilter', '10': 'BlockFilters'},
     {'1': 'Options', '3': 7, '4': 1, '5': 11, '6': '.api.ClaimQueryOptions', '10': 'Options'},
+    {'1': 'UsageContextEntity', '3': 8, '4': 1, '5': 14, '6': '.api.EntityType', '8': {}, '10': 'UsageContextEntity'},
+    {'1': 'UsageContextPath', '3': 9, '4': 1, '5': 9, '8': {}, '10': 'UsageContextPath'},
   ],
   '7': {},
 };
@@ -68,7 +70,15 @@ final $typed_data.Uint8List claimByFilterQueryDescriptor = $convert.base64Decode
     'dW1iZXIgb2YgbWF4aW11bSByZXN1bHRKBSI1MDAiUgtsaW1pdEZpbHRlchIiCgxxdWVyeUNvbn'
     'RleHQYBSABKAlSDHF1ZXJ5Q29udGV4dBI0CgxCbG9ja0ZpbHRlcnMYBiADKAsyEC5hcGkuQmxv'
     'Y2tGaWx0ZXJSDEJsb2NrRmlsdGVycxIwCgdPcHRpb25zGAcgASgLMhYuYXBpLkNsYWltUXVlcn'
-    'lPcHRpb25zUgdPcHRpb25zOg6SQQsKCdIBBkhlYWRlcg==');
+    'lPcHRpb25zUgdPcHRpb25zEsACChJVc2FnZUNvbnRleHRFbnRpdHkYCCABKA4yDy5hcGkuRW50'
+    'aXR5VHlwZUL+AZJB+gEyW09wdGlvbmFsIDogRW50aXR5IHRvIGFwcGx5IHRoZSByZXN0cmljdG'
+    'lvbiBydWxlcyAob24gdGhlIHBhdGggZGVmaW5lZCB3aXRoIFVzYWdlQ29udGV4dFBhdGhKmgFG'
+    'b3IgQWN0b3IsIHRvIGxpbWl0IHRoZSByZXN1bHRzIGFjY29yZGluZyB0byBPcmRlciBTaGlwRn'
+    'JvbSByZXN0cmljdGlvbiBydWxlcywgZGVmaW5lIFVzYWdlQ29udGV4dEVudGl0eSB0byBPcmRl'
+    'ciBhbmQgVXNhZ2VDb250ZXh0UGF0aCB0byBQYXlsb2FkLlNoaXBGcm9tUhJVc2FnZUNvbnRleH'
+    'RFbnRpdHkShAEKEFVzYWdlQ29udGV4dFBhdGgYCSABKAlCWJJBVTJTT3B0aW9uYWwgOiBQYXRo'
+    'IG9mIHJlc3RyaWN0aW9uIHJ1bGUgdG8gYXBwbHkgKFVzYWdlQ29udGV4dEVudGl0eSBzaG91bG'
+    'QgYmUgZGVmaW5lZClSEFVzYWdlQ29udGV4dFBhdGg6DpJBCwoJ0gEGSGVhZGVy');
 
 @$core.Deprecated('Use claimByFilterResultDescriptor instead')
 const ClaimByFilterResult$json = {
diff --git a/lib/executionflowQuery.pb.dart b/lib/executionflowQuery.pb.dart
index 7b425f4b..966cacb7 100644
--- a/lib/executionflowQuery.pb.dart
+++ b/lib/executionflowQuery.pb.dart
@@ -148,6 +148,8 @@ class ExecutionflowByFilterQuery extends $pb.GeneratedMessage {
     $core.String? queryContext,
     $core.Iterable<$2.BlockFilter>? blockFilters,
     ExecutionflowQueryOptions? options,
+    $2.EntityType? usageContextEntity,
+    $core.String? usageContextPath,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -155,6 +157,8 @@ class ExecutionflowByFilterQuery extends $pb.GeneratedMessage {
     if (queryContext != null) result.queryContext = queryContext;
     if (blockFilters != null) result.blockFilters.addAll(blockFilters);
     if (options != null) result.options = options;
+    if (usageContextEntity != null) result.usageContextEntity = usageContextEntity;
+    if (usageContextPath != null) result.usageContextPath = usageContextPath;
     return result;
   }
 
@@ -169,6 +173,8 @@ class ExecutionflowByFilterQuery extends $pb.GeneratedMessage {
     ..aOS(5, _omitFieldNames ? '' : 'queryContext', protoName: 'queryContext')
     ..pc<$2.BlockFilter>(6, _omitFieldNames ? '' : 'BlockFilters', $pb.PbFieldType.PM, protoName: 'BlockFilters', subBuilder: $2.BlockFilter.create)
     ..aOM<ExecutionflowQueryOptions>(7, _omitFieldNames ? '' : 'Options', protoName: 'Options', subBuilder: ExecutionflowQueryOptions.create)
+    ..e<$2.EntityType>(8, _omitFieldNames ? '' : 'UsageContextEntity', $pb.PbFieldType.OE, protoName: 'UsageContextEntity', defaultOrMaker: $2.EntityType.ENTITY_TYPE_UNKNOWN, valueOf: $2.EntityType.valueOf, enumValues: $2.EntityType.values)
+    ..aOS(9, _omitFieldNames ? '' : 'UsageContextPath', protoName: 'UsageContextPath')
     ..hasRequiredFields = false
   ;
 
@@ -233,6 +239,24 @@ class ExecutionflowByFilterQuery extends $pb.GeneratedMessage {
   void clearOptions() => $_clearField(7);
   @$pb.TagNumber(7)
   ExecutionflowQueryOptions ensureOptions() => $_ensure(4);
+
+  @$pb.TagNumber(8)
+  $2.EntityType get usageContextEntity => $_getN(5);
+  @$pb.TagNumber(8)
+  set usageContextEntity($2.EntityType value) => $_setField(8, value);
+  @$pb.TagNumber(8)
+  $core.bool hasUsageContextEntity() => $_has(5);
+  @$pb.TagNumber(8)
+  void clearUsageContextEntity() => $_clearField(8);
+
+  @$pb.TagNumber(9)
+  $core.String get usageContextPath => $_getSZ(6);
+  @$pb.TagNumber(9)
+  set usageContextPath($core.String value) => $_setString(6, value);
+  @$pb.TagNumber(9)
+  $core.bool hasUsageContextPath() => $_has(6);
+  @$pb.TagNumber(9)
+  void clearUsageContextPath() => $_clearField(9);
 }
 
 class ExecutionflowByFilterResult extends $pb.GeneratedMessage {
diff --git a/lib/executionflowQuery.pbjson.dart b/lib/executionflowQuery.pbjson.dart
index 9895213e..12bb6742 100644
--- a/lib/executionflowQuery.pbjson.dart
+++ b/lib/executionflowQuery.pbjson.dart
@@ -57,6 +57,8 @@ const ExecutionflowByFilterQuery$json = {
     {'1': 'queryContext', '3': 5, '4': 1, '5': 9, '10': 'queryContext'},
     {'1': 'BlockFilters', '3': 6, '4': 3, '5': 11, '6': '.api.BlockFilter', '10': 'BlockFilters'},
     {'1': 'Options', '3': 7, '4': 1, '5': 11, '6': '.api.ExecutionflowQueryOptions', '10': 'Options'},
+    {'1': 'UsageContextEntity', '3': 8, '4': 1, '5': 14, '6': '.api.EntityType', '8': {}, '10': 'UsageContextEntity'},
+    {'1': 'UsageContextPath', '3': 9, '4': 1, '5': 9, '8': {}, '10': 'UsageContextPath'},
   ],
   '7': {},
 };
@@ -68,7 +70,16 @@ final $typed_data.Uint8List executionflowByFilterQueryDescriptor = $convert.base
     'QSEyGE51bWJlciBvZiBtYXhpbXVtIHJlc3VsdEoFIjUwMCJSC2xpbWl0RmlsdGVyEiIKDHF1ZX'
     'J5Q29udGV4dBgFIAEoCVIMcXVlcnlDb250ZXh0EjQKDEJsb2NrRmlsdGVycxgGIAMoCzIQLmFw'
     'aS5CbG9ja0ZpbHRlclIMQmxvY2tGaWx0ZXJzEjgKB09wdGlvbnMYByABKAsyHi5hcGkuRXhlY3'
-    'V0aW9uZmxvd1F1ZXJ5T3B0aW9uc1IHT3B0aW9uczoOkkELCgnSAQZIZWFkZXI=');
+    'V0aW9uZmxvd1F1ZXJ5T3B0aW9uc1IHT3B0aW9ucxLAAgoSVXNhZ2VDb250ZXh0RW50aXR5GAgg'
+    'ASgOMg8uYXBpLkVudGl0eVR5cGVC/gGSQfoBMltPcHRpb25hbCA6IEVudGl0eSB0byBhcHBseS'
+    'B0aGUgcmVzdHJpY3Rpb24gcnVsZXMgKG9uIHRoZSBwYXRoIGRlZmluZWQgd2l0aCBVc2FnZUNv'
+    'bnRleHRQYXRoSpoBRm9yIEFjdG9yLCB0byBsaW1pdCB0aGUgcmVzdWx0cyBhY2NvcmRpbmcgdG'
+    '8gT3JkZXIgU2hpcEZyb20gcmVzdHJpY3Rpb24gcnVsZXMsIGRlZmluZSBVc2FnZUNvbnRleHRF'
+    'bnRpdHkgdG8gT3JkZXIgYW5kIFVzYWdlQ29udGV4dFBhdGggdG8gUGF5bG9hZC5TaGlwRnJvbV'
+    'ISVXNhZ2VDb250ZXh0RW50aXR5EoQBChBVc2FnZUNvbnRleHRQYXRoGAkgASgJQliSQVUyU09w'
+    'dGlvbmFsIDogUGF0aCBvZiByZXN0cmljdGlvbiBydWxlIHRvIGFwcGx5IChVc2FnZUNvbnRleH'
+    'RFbnRpdHkgc2hvdWxkIGJlIGRlZmluZWQpUhBVc2FnZUNvbnRleHRQYXRoOg6SQQsKCdIBBkhl'
+    'YWRlcg==');
 
 @$core.Deprecated('Use executionflowByFilterResultDescriptor instead')
 const ExecutionflowByFilterResult$json = {
diff --git a/lib/handlingunitQuery.pb.dart b/lib/handlingunitQuery.pb.dart
index fffd711b..1e84ab9a 100644
--- a/lib/handlingunitQuery.pb.dart
+++ b/lib/handlingunitQuery.pb.dart
@@ -148,6 +148,8 @@ class HandlingunitByFilterQuery extends $pb.GeneratedMessage {
     $core.String? queryContext,
     $core.Iterable<$1.BlockFilter>? blockFilters,
     HandlingunitQueryOptions? options,
+    $1.EntityType? usageContextEntity,
+    $core.String? usageContextPath,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -155,6 +157,8 @@ class HandlingunitByFilterQuery extends $pb.GeneratedMessage {
     if (queryContext != null) result.queryContext = queryContext;
     if (blockFilters != null) result.blockFilters.addAll(blockFilters);
     if (options != null) result.options = options;
+    if (usageContextEntity != null) result.usageContextEntity = usageContextEntity;
+    if (usageContextPath != null) result.usageContextPath = usageContextPath;
     return result;
   }
 
@@ -169,6 +173,8 @@ class HandlingunitByFilterQuery extends $pb.GeneratedMessage {
     ..aOS(5, _omitFieldNames ? '' : 'queryContext', protoName: 'queryContext')
     ..pc<$1.BlockFilter>(7, _omitFieldNames ? '' : 'BlockFilters', $pb.PbFieldType.PM, protoName: 'BlockFilters', subBuilder: $1.BlockFilter.create)
     ..aOM<HandlingunitQueryOptions>(8, _omitFieldNames ? '' : 'Options', protoName: 'Options', subBuilder: HandlingunitQueryOptions.create)
+    ..e<$1.EntityType>(9, _omitFieldNames ? '' : 'UsageContextEntity', $pb.PbFieldType.OE, protoName: 'UsageContextEntity', defaultOrMaker: $1.EntityType.ENTITY_TYPE_UNKNOWN, valueOf: $1.EntityType.valueOf, enumValues: $1.EntityType.values)
+    ..aOS(10, _omitFieldNames ? '' : 'UsageContextPath', protoName: 'UsageContextPath')
     ..hasRequiredFields = false
   ;
 
@@ -232,6 +238,24 @@ class HandlingunitByFilterQuery extends $pb.GeneratedMessage {
   void clearOptions() => $_clearField(8);
   @$pb.TagNumber(8)
   HandlingunitQueryOptions ensureOptions() => $_ensure(4);
+
+  @$pb.TagNumber(9)
+  $1.EntityType get usageContextEntity => $_getN(5);
+  @$pb.TagNumber(9)
+  set usageContextEntity($1.EntityType value) => $_setField(9, value);
+  @$pb.TagNumber(9)
+  $core.bool hasUsageContextEntity() => $_has(5);
+  @$pb.TagNumber(9)
+  void clearUsageContextEntity() => $_clearField(9);
+
+  @$pb.TagNumber(10)
+  $core.String get usageContextPath => $_getSZ(6);
+  @$pb.TagNumber(10)
+  set usageContextPath($core.String value) => $_setString(6, value);
+  @$pb.TagNumber(10)
+  $core.bool hasUsageContextPath() => $_has(6);
+  @$pb.TagNumber(10)
+  void clearUsageContextPath() => $_clearField(10);
 }
 
 class HandlingunitByFilterResult extends $pb.GeneratedMessage {
diff --git a/lib/handlingunitQuery.pbjson.dart b/lib/handlingunitQuery.pbjson.dart
index ee5db007..b83a66f1 100644
--- a/lib/handlingunitQuery.pbjson.dart
+++ b/lib/handlingunitQuery.pbjson.dart
@@ -57,6 +57,8 @@ const HandlingunitByFilterQuery$json = {
     {'1': 'queryContext', '3': 5, '4': 1, '5': 9, '10': 'queryContext'},
     {'1': 'BlockFilters', '3': 7, '4': 3, '5': 11, '6': '.api.BlockFilter', '10': 'BlockFilters'},
     {'1': 'Options', '3': 8, '4': 1, '5': 11, '6': '.api.HandlingunitQueryOptions', '10': 'Options'},
+    {'1': 'UsageContextEntity', '3': 9, '4': 1, '5': 14, '6': '.api.EntityType', '8': {}, '10': 'UsageContextEntity'},
+    {'1': 'UsageContextPath', '3': 10, '4': 1, '5': 9, '8': {}, '10': 'UsageContextPath'},
   ],
 };
 
@@ -66,7 +68,15 @@ final $typed_data.Uint8List handlingunitByFilterQueryDescriptor = $convert.base6
     'Byb2plY3RIZWFkZXJSBkhlYWRlchIgCgtsaW1pdEZpbHRlchgEIAEoCVILbGltaXRGaWx0ZXIS'
     'IgoMcXVlcnlDb250ZXh0GAUgASgJUgxxdWVyeUNvbnRleHQSNAoMQmxvY2tGaWx0ZXJzGAcgAy'
     'gLMhAuYXBpLkJsb2NrRmlsdGVyUgxCbG9ja0ZpbHRlcnMSNwoHT3B0aW9ucxgIIAEoCzIdLmFw'
-    'aS5IYW5kbGluZ3VuaXRRdWVyeU9wdGlvbnNSB09wdGlvbnM=');
+    'aS5IYW5kbGluZ3VuaXRRdWVyeU9wdGlvbnNSB09wdGlvbnMSwAIKElVzYWdlQ29udGV4dEVudG'
+    'l0eRgJIAEoDjIPLmFwaS5FbnRpdHlUeXBlQv4BkkH6ATJbT3B0aW9uYWwgOiBFbnRpdHkgdG8g'
+    'YXBwbHkgdGhlIHJlc3RyaWN0aW9uIHJ1bGVzIChvbiB0aGUgcGF0aCBkZWZpbmVkIHdpdGggVX'
+    'NhZ2VDb250ZXh0UGF0aEqaAUZvciBBY3RvciwgdG8gbGltaXQgdGhlIHJlc3VsdHMgYWNjb3Jk'
+    'aW5nIHRvIE9yZGVyIFNoaXBGcm9tIHJlc3RyaWN0aW9uIHJ1bGVzLCBkZWZpbmUgVXNhZ2VDb2'
+    '50ZXh0RW50aXR5IHRvIE9yZGVyIGFuZCBVc2FnZUNvbnRleHRQYXRoIHRvIFBheWxvYWQuU2hp'
+    'cEZyb21SElVzYWdlQ29udGV4dEVudGl0eRKEAQoQVXNhZ2VDb250ZXh0UGF0aBgKIAEoCUJYkk'
+    'FVMlNPcHRpb25hbCA6IFBhdGggb2YgcmVzdHJpY3Rpb24gcnVsZSB0byBhcHBseSAoVXNhZ2VD'
+    'b250ZXh0RW50aXR5IHNob3VsZCBiZSBkZWZpbmVkKVIQVXNhZ2VDb250ZXh0UGF0aA==');
 
 @$core.Deprecated('Use handlingunitByFilterResultDescriptor instead')
 const HandlingunitByFilterResult$json = {
diff --git a/lib/itemQuery.pb.dart b/lib/itemQuery.pb.dart
index 94a6687c..d3639c7c 100644
--- a/lib/itemQuery.pb.dart
+++ b/lib/itemQuery.pb.dart
@@ -150,6 +150,8 @@ class ItemByFilterQuery extends $pb.GeneratedMessage {
     $core.String? queryContext,
     $core.Iterable<$1.BlockFilter>? blockFilters,
     ItemQueryOptions? options,
+    $1.EntityType? usageContextEntity,
+    $core.String? usageContextPath,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -157,6 +159,8 @@ class ItemByFilterQuery extends $pb.GeneratedMessage {
     if (queryContext != null) result.queryContext = queryContext;
     if (blockFilters != null) result.blockFilters.addAll(blockFilters);
     if (options != null) result.options = options;
+    if (usageContextEntity != null) result.usageContextEntity = usageContextEntity;
+    if (usageContextPath != null) result.usageContextPath = usageContextPath;
     return result;
   }
 
@@ -171,6 +175,8 @@ class ItemByFilterQuery extends $pb.GeneratedMessage {
     ..aOS(5, _omitFieldNames ? '' : 'queryContext', protoName: 'queryContext')
     ..pc<$1.BlockFilter>(6, _omitFieldNames ? '' : 'BlockFilters', $pb.PbFieldType.PM, protoName: 'BlockFilters', subBuilder: $1.BlockFilter.create)
     ..aOM<ItemQueryOptions>(7, _omitFieldNames ? '' : 'Options', protoName: 'Options', subBuilder: ItemQueryOptions.create)
+    ..e<$1.EntityType>(8, _omitFieldNames ? '' : 'UsageContextEntity', $pb.PbFieldType.OE, protoName: 'UsageContextEntity', defaultOrMaker: $1.EntityType.ENTITY_TYPE_UNKNOWN, valueOf: $1.EntityType.valueOf, enumValues: $1.EntityType.values)
+    ..aOS(9, _omitFieldNames ? '' : 'UsageContextPath', protoName: 'UsageContextPath')
     ..hasRequiredFields = false
   ;
 
@@ -235,6 +241,24 @@ class ItemByFilterQuery extends $pb.GeneratedMessage {
   void clearOptions() => $_clearField(7);
   @$pb.TagNumber(7)
   ItemQueryOptions ensureOptions() => $_ensure(4);
+
+  @$pb.TagNumber(8)
+  $1.EntityType get usageContextEntity => $_getN(5);
+  @$pb.TagNumber(8)
+  set usageContextEntity($1.EntityType value) => $_setField(8, value);
+  @$pb.TagNumber(8)
+  $core.bool hasUsageContextEntity() => $_has(5);
+  @$pb.TagNumber(8)
+  void clearUsageContextEntity() => $_clearField(8);
+
+  @$pb.TagNumber(9)
+  $core.String get usageContextPath => $_getSZ(6);
+  @$pb.TagNumber(9)
+  set usageContextPath($core.String value) => $_setString(6, value);
+  @$pb.TagNumber(9)
+  $core.bool hasUsageContextPath() => $_has(6);
+  @$pb.TagNumber(9)
+  void clearUsageContextPath() => $_clearField(9);
 }
 
 class ItemByFilterResult extends $pb.GeneratedMessage {
diff --git a/lib/itemQuery.pbjson.dart b/lib/itemQuery.pbjson.dart
index 86b5d754..0acb77d9 100644
--- a/lib/itemQuery.pbjson.dart
+++ b/lib/itemQuery.pbjson.dart
@@ -57,6 +57,8 @@ const ItemByFilterQuery$json = {
     {'1': 'queryContext', '3': 5, '4': 1, '5': 9, '10': 'queryContext'},
     {'1': 'BlockFilters', '3': 6, '4': 3, '5': 11, '6': '.api.BlockFilter', '10': 'BlockFilters'},
     {'1': 'Options', '3': 7, '4': 1, '5': 11, '6': '.api.ItemQueryOptions', '10': 'Options'},
+    {'1': 'UsageContextEntity', '3': 8, '4': 1, '5': 14, '6': '.api.EntityType', '8': {}, '10': 'UsageContextEntity'},
+    {'1': 'UsageContextPath', '3': 9, '4': 1, '5': 9, '8': {}, '10': 'UsageContextPath'},
   ],
   '7': {},
 };
@@ -68,7 +70,15 @@ final $typed_data.Uint8List itemByFilterQueryDescriptor = $convert.base64Decode(
     'ciBvZiBtYXhpbXVtIHJlc3VsdEoFIjUwMCJSC2xpbWl0RmlsdGVyEiIKDHF1ZXJ5Q29udGV4dB'
     'gFIAEoCVIMcXVlcnlDb250ZXh0EjQKDEJsb2NrRmlsdGVycxgGIAMoCzIQLmFwaS5CbG9ja0Zp'
     'bHRlclIMQmxvY2tGaWx0ZXJzEi8KB09wdGlvbnMYByABKAsyFS5hcGkuSXRlbVF1ZXJ5T3B0aW'
-    '9uc1IHT3B0aW9uczoOkkELCgnSAQZIZWFkZXI=');
+    '9uc1IHT3B0aW9ucxLAAgoSVXNhZ2VDb250ZXh0RW50aXR5GAggASgOMg8uYXBpLkVudGl0eVR5'
+    'cGVC/gGSQfoBMltPcHRpb25hbCA6IEVudGl0eSB0byBhcHBseSB0aGUgcmVzdHJpY3Rpb24gcn'
+    'VsZXMgKG9uIHRoZSBwYXRoIGRlZmluZWQgd2l0aCBVc2FnZUNvbnRleHRQYXRoSpoBRm9yIEFj'
+    'dG9yLCB0byBsaW1pdCB0aGUgcmVzdWx0cyBhY2NvcmRpbmcgdG8gT3JkZXIgU2hpcEZyb20gcm'
+    'VzdHJpY3Rpb24gcnVsZXMsIGRlZmluZSBVc2FnZUNvbnRleHRFbnRpdHkgdG8gT3JkZXIgYW5k'
+    'IFVzYWdlQ29udGV4dFBhdGggdG8gUGF5bG9hZC5TaGlwRnJvbVISVXNhZ2VDb250ZXh0RW50aX'
+    'R5EoQBChBVc2FnZUNvbnRleHRQYXRoGAkgASgJQliSQVUyU09wdGlvbmFsIDogUGF0aCBvZiBy'
+    'ZXN0cmljdGlvbiBydWxlIHRvIGFwcGx5IChVc2FnZUNvbnRleHRFbnRpdHkgc2hvdWxkIGJlIG'
+    'RlZmluZWQpUhBVc2FnZUNvbnRleHRQYXRoOg6SQQsKCdIBBkhlYWRlcg==');
 
 @$core.Deprecated('Use itemByFilterResultDescriptor instead')
 const ItemByFilterResult$json = {
diff --git a/lib/movementQuery.pb.dart b/lib/movementQuery.pb.dart
index 434a0d39..b2defd54 100644
--- a/lib/movementQuery.pb.dart
+++ b/lib/movementQuery.pb.dart
@@ -148,6 +148,8 @@ class MovementByFilterQuery extends $pb.GeneratedMessage {
     $core.String? queryContext,
     $core.Iterable<$1.BlockFilter>? blockFilters,
     MovementQueryOptions? options,
+    $1.EntityType? usageContextEntity,
+    $core.String? usageContextPath,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -155,6 +157,8 @@ class MovementByFilterQuery extends $pb.GeneratedMessage {
     if (queryContext != null) result.queryContext = queryContext;
     if (blockFilters != null) result.blockFilters.addAll(blockFilters);
     if (options != null) result.options = options;
+    if (usageContextEntity != null) result.usageContextEntity = usageContextEntity;
+    if (usageContextPath != null) result.usageContextPath = usageContextPath;
     return result;
   }
 
@@ -169,6 +173,8 @@ class MovementByFilterQuery extends $pb.GeneratedMessage {
     ..aOS(5, _omitFieldNames ? '' : 'queryContext', protoName: 'queryContext')
     ..pc<$1.BlockFilter>(7, _omitFieldNames ? '' : 'BlockFilters', $pb.PbFieldType.PM, protoName: 'BlockFilters', subBuilder: $1.BlockFilter.create)
     ..aOM<MovementQueryOptions>(8, _omitFieldNames ? '' : 'Options', protoName: 'Options', subBuilder: MovementQueryOptions.create)
+    ..e<$1.EntityType>(9, _omitFieldNames ? '' : 'UsageContextEntity', $pb.PbFieldType.OE, protoName: 'UsageContextEntity', defaultOrMaker: $1.EntityType.ENTITY_TYPE_UNKNOWN, valueOf: $1.EntityType.valueOf, enumValues: $1.EntityType.values)
+    ..aOS(10, _omitFieldNames ? '' : 'UsageContextPath', protoName: 'UsageContextPath')
     ..hasRequiredFields = false
   ;
 
@@ -233,6 +239,24 @@ class MovementByFilterQuery extends $pb.GeneratedMessage {
   void clearOptions() => $_clearField(8);
   @$pb.TagNumber(8)
   MovementQueryOptions ensureOptions() => $_ensure(4);
+
+  @$pb.TagNumber(9)
+  $1.EntityType get usageContextEntity => $_getN(5);
+  @$pb.TagNumber(9)
+  set usageContextEntity($1.EntityType value) => $_setField(9, value);
+  @$pb.TagNumber(9)
+  $core.bool hasUsageContextEntity() => $_has(5);
+  @$pb.TagNumber(9)
+  void clearUsageContextEntity() => $_clearField(9);
+
+  @$pb.TagNumber(10)
+  $core.String get usageContextPath => $_getSZ(6);
+  @$pb.TagNumber(10)
+  set usageContextPath($core.String value) => $_setString(6, value);
+  @$pb.TagNumber(10)
+  $core.bool hasUsageContextPath() => $_has(6);
+  @$pb.TagNumber(10)
+  void clearUsageContextPath() => $_clearField(10);
 }
 
 class MovementByFilterResult extends $pb.GeneratedMessage {
diff --git a/lib/movementQuery.pbjson.dart b/lib/movementQuery.pbjson.dart
index a2cedc99..c4bff02f 100644
--- a/lib/movementQuery.pbjson.dart
+++ b/lib/movementQuery.pbjson.dart
@@ -57,6 +57,8 @@ const MovementByFilterQuery$json = {
     {'1': 'queryContext', '3': 5, '4': 1, '5': 9, '10': 'queryContext'},
     {'1': 'BlockFilters', '3': 7, '4': 3, '5': 11, '6': '.api.BlockFilter', '10': 'BlockFilters'},
     {'1': 'Options', '3': 8, '4': 1, '5': 11, '6': '.api.MovementQueryOptions', '10': 'Options'},
+    {'1': 'UsageContextEntity', '3': 9, '4': 1, '5': 14, '6': '.api.EntityType', '8': {}, '10': 'UsageContextEntity'},
+    {'1': 'UsageContextPath', '3': 10, '4': 1, '5': 9, '8': {}, '10': 'UsageContextPath'},
   ],
   '7': {},
 };
@@ -68,7 +70,15 @@ final $typed_data.Uint8List movementByFilterQueryDescriptor = $convert.base64Dec
     'dW1iZXIgb2YgbWF4aW11bSByZXN1bHRKBSI1MDAiUgtsaW1pdEZpbHRlchIiCgxxdWVyeUNvbn'
     'RleHQYBSABKAlSDHF1ZXJ5Q29udGV4dBI0CgxCbG9ja0ZpbHRlcnMYByADKAsyEC5hcGkuQmxv'
     'Y2tGaWx0ZXJSDEJsb2NrRmlsdGVycxIzCgdPcHRpb25zGAggASgLMhkuYXBpLk1vdmVtZW50UX'
-    'VlcnlPcHRpb25zUgdPcHRpb25zOg6SQQsKCdIBBkhlYWRlcg==');
+    'VlcnlPcHRpb25zUgdPcHRpb25zEsACChJVc2FnZUNvbnRleHRFbnRpdHkYCSABKA4yDy5hcGku'
+    'RW50aXR5VHlwZUL+AZJB+gEyW09wdGlvbmFsIDogRW50aXR5IHRvIGFwcGx5IHRoZSByZXN0cm'
+    'ljdGlvbiBydWxlcyAob24gdGhlIHBhdGggZGVmaW5lZCB3aXRoIFVzYWdlQ29udGV4dFBhdGhK'
+    'mgFGb3IgQWN0b3IsIHRvIGxpbWl0IHRoZSByZXN1bHRzIGFjY29yZGluZyB0byBPcmRlciBTaG'
+    'lwRnJvbSByZXN0cmljdGlvbiBydWxlcywgZGVmaW5lIFVzYWdlQ29udGV4dEVudGl0eSB0byBP'
+    'cmRlciBhbmQgVXNhZ2VDb250ZXh0UGF0aCB0byBQYXlsb2FkLlNoaXBGcm9tUhJVc2FnZUNvbn'
+    'RleHRFbnRpdHkShAEKEFVzYWdlQ29udGV4dFBhdGgYCiABKAlCWJJBVTJTT3B0aW9uYWwgOiBQ'
+    'YXRoIG9mIHJlc3RyaWN0aW9uIHJ1bGUgdG8gYXBwbHkgKFVzYWdlQ29udGV4dEVudGl0eSBzaG'
+    '91bGQgYmUgZGVmaW5lZClSEFVzYWdlQ29udGV4dFBhdGg6DpJBCwoJ0gEGSGVhZGVy');
 
 @$core.Deprecated('Use movementByFilterResultDescriptor instead')
 const MovementByFilterResult$json = {
diff --git a/lib/orderQuery.pb.dart b/lib/orderQuery.pb.dart
index fa1ff731..476f92da 100644
--- a/lib/orderQuery.pb.dart
+++ b/lib/orderQuery.pb.dart
@@ -148,6 +148,8 @@ class OrderByFilterQuery extends $pb.GeneratedMessage {
     $core.String? queryContext,
     $core.Iterable<$1.BlockFilter>? blockFilters,
     OrderQueryOptions? options,
+    $1.EntityType? usageContextEntity,
+    $core.String? usageContextPath,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -155,6 +157,8 @@ class OrderByFilterQuery extends $pb.GeneratedMessage {
     if (queryContext != null) result.queryContext = queryContext;
     if (blockFilters != null) result.blockFilters.addAll(blockFilters);
     if (options != null) result.options = options;
+    if (usageContextEntity != null) result.usageContextEntity = usageContextEntity;
+    if (usageContextPath != null) result.usageContextPath = usageContextPath;
     return result;
   }
 
@@ -169,6 +173,8 @@ class OrderByFilterQuery extends $pb.GeneratedMessage {
     ..aOS(5, _omitFieldNames ? '' : 'queryContext', protoName: 'queryContext')
     ..pc<$1.BlockFilter>(6, _omitFieldNames ? '' : 'BlockFilters', $pb.PbFieldType.PM, protoName: 'BlockFilters', subBuilder: $1.BlockFilter.create)
     ..aOM<OrderQueryOptions>(7, _omitFieldNames ? '' : 'Options', protoName: 'Options', subBuilder: OrderQueryOptions.create)
+    ..e<$1.EntityType>(8, _omitFieldNames ? '' : 'UsageContextEntity', $pb.PbFieldType.OE, protoName: 'UsageContextEntity', defaultOrMaker: $1.EntityType.ENTITY_TYPE_UNKNOWN, valueOf: $1.EntityType.valueOf, enumValues: $1.EntityType.values)
+    ..aOS(9, _omitFieldNames ? '' : 'UsageContextPath', protoName: 'UsageContextPath')
     ..hasRequiredFields = false
   ;
 
@@ -233,6 +239,24 @@ class OrderByFilterQuery extends $pb.GeneratedMessage {
   void clearOptions() => $_clearField(7);
   @$pb.TagNumber(7)
   OrderQueryOptions ensureOptions() => $_ensure(4);
+
+  @$pb.TagNumber(8)
+  $1.EntityType get usageContextEntity => $_getN(5);
+  @$pb.TagNumber(8)
+  set usageContextEntity($1.EntityType value) => $_setField(8, value);
+  @$pb.TagNumber(8)
+  $core.bool hasUsageContextEntity() => $_has(5);
+  @$pb.TagNumber(8)
+  void clearUsageContextEntity() => $_clearField(8);
+
+  @$pb.TagNumber(9)
+  $core.String get usageContextPath => $_getSZ(6);
+  @$pb.TagNumber(9)
+  set usageContextPath($core.String value) => $_setString(6, value);
+  @$pb.TagNumber(9)
+  $core.bool hasUsageContextPath() => $_has(6);
+  @$pb.TagNumber(9)
+  void clearUsageContextPath() => $_clearField(9);
 }
 
 class OrderByFilterResult extends $pb.GeneratedMessage {
diff --git a/lib/orderQuery.pbjson.dart b/lib/orderQuery.pbjson.dart
index 6c60a5fc..0797fc10 100644
--- a/lib/orderQuery.pbjson.dart
+++ b/lib/orderQuery.pbjson.dart
@@ -56,6 +56,8 @@ const OrderByFilterQuery$json = {
     {'1': 'queryContext', '3': 5, '4': 1, '5': 9, '10': 'queryContext'},
     {'1': 'BlockFilters', '3': 6, '4': 3, '5': 11, '6': '.api.BlockFilter', '10': 'BlockFilters'},
     {'1': 'Options', '3': 7, '4': 1, '5': 11, '6': '.api.OrderQueryOptions', '10': 'Options'},
+    {'1': 'UsageContextEntity', '3': 8, '4': 1, '5': 14, '6': '.api.EntityType', '8': {}, '10': 'UsageContextEntity'},
+    {'1': 'UsageContextPath', '3': 9, '4': 1, '5': 9, '8': {}, '10': 'UsageContextPath'},
   ],
   '7': {},
 };
@@ -67,7 +69,15 @@ final $typed_data.Uint8List orderByFilterQueryDescriptor = $convert.base64Decode
     'ZXIgb2YgbWF4aW11bSByZXN1bHRKBSI1MDAiUgtsaW1pdEZpbHRlchIiCgxxdWVyeUNvbnRleH'
     'QYBSABKAlSDHF1ZXJ5Q29udGV4dBI0CgxCbG9ja0ZpbHRlcnMYBiADKAsyEC5hcGkuQmxvY2tG'
     'aWx0ZXJSDEJsb2NrRmlsdGVycxIwCgdPcHRpb25zGAcgASgLMhYuYXBpLk9yZGVyUXVlcnlPcH'
-    'Rpb25zUgdPcHRpb25zOg6SQQsKCdIBBkhlYWRlcg==');
+    'Rpb25zUgdPcHRpb25zEsACChJVc2FnZUNvbnRleHRFbnRpdHkYCCABKA4yDy5hcGkuRW50aXR5'
+    'VHlwZUL+AZJB+gEyW09wdGlvbmFsIDogRW50aXR5IHRvIGFwcGx5IHRoZSByZXN0cmljdGlvbi'
+    'BydWxlcyAob24gdGhlIHBhdGggZGVmaW5lZCB3aXRoIFVzYWdlQ29udGV4dFBhdGhKmgFGb3Ig'
+    'QWN0b3IsIHRvIGxpbWl0IHRoZSByZXN1bHRzIGFjY29yZGluZyB0byBPcmRlciBTaGlwRnJvbS'
+    'ByZXN0cmljdGlvbiBydWxlcywgZGVmaW5lIFVzYWdlQ29udGV4dEVudGl0eSB0byBPcmRlciBh'
+    'bmQgVXNhZ2VDb250ZXh0UGF0aCB0byBQYXlsb2FkLlNoaXBGcm9tUhJVc2FnZUNvbnRleHRFbn'
+    'RpdHkShAEKEFVzYWdlQ29udGV4dFBhdGgYCSABKAlCWJJBVTJTT3B0aW9uYWwgOiBQYXRoIG9m'
+    'IHJlc3RyaWN0aW9uIHJ1bGUgdG8gYXBwbHkgKFVzYWdlQ29udGV4dEVudGl0eSBzaG91bGQgYm'
+    'UgZGVmaW5lZClSEFVzYWdlQ29udGV4dFBhdGg6DpJBCwoJ0gEGSGVhZGVy');
 
 @$core.Deprecated('Use orderByFilterResultDescriptor instead')
 const OrderByFilterResult$json = {
diff --git a/lib/partnerQuery.pb.dart b/lib/partnerQuery.pb.dart
index f3a6ffbf..9281564e 100644
--- a/lib/partnerQuery.pb.dart
+++ b/lib/partnerQuery.pb.dart
@@ -148,6 +148,8 @@ class PartnerByFilterQuery extends $pb.GeneratedMessage {
     $core.String? queryContext,
     $core.Iterable<$1.BlockFilter>? blockFilters,
     PartnerQueryOptions? options,
+    $1.EntityType? usageContextEntity,
+    $core.String? usageContextPath,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -155,6 +157,8 @@ class PartnerByFilterQuery extends $pb.GeneratedMessage {
     if (queryContext != null) result.queryContext = queryContext;
     if (blockFilters != null) result.blockFilters.addAll(blockFilters);
     if (options != null) result.options = options;
+    if (usageContextEntity != null) result.usageContextEntity = usageContextEntity;
+    if (usageContextPath != null) result.usageContextPath = usageContextPath;
     return result;
   }
 
@@ -169,6 +173,8 @@ class PartnerByFilterQuery extends $pb.GeneratedMessage {
     ..aOS(5, _omitFieldNames ? '' : 'queryContext', protoName: 'queryContext')
     ..pc<$1.BlockFilter>(6, _omitFieldNames ? '' : 'BlockFilters', $pb.PbFieldType.PM, protoName: 'BlockFilters', subBuilder: $1.BlockFilter.create)
     ..aOM<PartnerQueryOptions>(7, _omitFieldNames ? '' : 'Options', protoName: 'Options', subBuilder: PartnerQueryOptions.create)
+    ..e<$1.EntityType>(8, _omitFieldNames ? '' : 'UsageContextEntity', $pb.PbFieldType.OE, protoName: 'UsageContextEntity', defaultOrMaker: $1.EntityType.ENTITY_TYPE_UNKNOWN, valueOf: $1.EntityType.valueOf, enumValues: $1.EntityType.values)
+    ..aOS(9, _omitFieldNames ? '' : 'UsageContextPath', protoName: 'UsageContextPath')
     ..hasRequiredFields = false
   ;
 
@@ -233,6 +239,24 @@ class PartnerByFilterQuery extends $pb.GeneratedMessage {
   void clearOptions() => $_clearField(7);
   @$pb.TagNumber(7)
   PartnerQueryOptions ensureOptions() => $_ensure(4);
+
+  @$pb.TagNumber(8)
+  $1.EntityType get usageContextEntity => $_getN(5);
+  @$pb.TagNumber(8)
+  set usageContextEntity($1.EntityType value) => $_setField(8, value);
+  @$pb.TagNumber(8)
+  $core.bool hasUsageContextEntity() => $_has(5);
+  @$pb.TagNumber(8)
+  void clearUsageContextEntity() => $_clearField(8);
+
+  @$pb.TagNumber(9)
+  $core.String get usageContextPath => $_getSZ(6);
+  @$pb.TagNumber(9)
+  set usageContextPath($core.String value) => $_setString(6, value);
+  @$pb.TagNumber(9)
+  $core.bool hasUsageContextPath() => $_has(6);
+  @$pb.TagNumber(9)
+  void clearUsageContextPath() => $_clearField(9);
 }
 
 class PartnerByFilterResult extends $pb.GeneratedMessage {
diff --git a/lib/partnerQuery.pbjson.dart b/lib/partnerQuery.pbjson.dart
index 385cb558..c322d3ba 100644
--- a/lib/partnerQuery.pbjson.dart
+++ b/lib/partnerQuery.pbjson.dart
@@ -57,6 +57,8 @@ const PartnerByFilterQuery$json = {
     {'1': 'queryContext', '3': 5, '4': 1, '5': 9, '10': 'queryContext'},
     {'1': 'BlockFilters', '3': 6, '4': 3, '5': 11, '6': '.api.BlockFilter', '10': 'BlockFilters'},
     {'1': 'Options', '3': 7, '4': 1, '5': 11, '6': '.api.PartnerQueryOptions', '10': 'Options'},
+    {'1': 'UsageContextEntity', '3': 8, '4': 1, '5': 14, '6': '.api.EntityType', '8': {}, '10': 'UsageContextEntity'},
+    {'1': 'UsageContextPath', '3': 9, '4': 1, '5': 9, '8': {}, '10': 'UsageContextPath'},
   ],
   '7': {},
 };
@@ -68,7 +70,15 @@ final $typed_data.Uint8List partnerByFilterQueryDescriptor = $convert.base64Deco
     'bWJlciBvZiBtYXhpbXVtIHJlc3VsdEoFIjUwMCJSC2xpbWl0RmlsdGVyEiIKDHF1ZXJ5Q29udG'
     'V4dBgFIAEoCVIMcXVlcnlDb250ZXh0EjQKDEJsb2NrRmlsdGVycxgGIAMoCzIQLmFwaS5CbG9j'
     'a0ZpbHRlclIMQmxvY2tGaWx0ZXJzEjIKB09wdGlvbnMYByABKAsyGC5hcGkuUGFydG5lclF1ZX'
-    'J5T3B0aW9uc1IHT3B0aW9uczoOkkELCgnSAQZIZWFkZXI=');
+    'J5T3B0aW9uc1IHT3B0aW9ucxLAAgoSVXNhZ2VDb250ZXh0RW50aXR5GAggASgOMg8uYXBpLkVu'
+    'dGl0eVR5cGVC/gGSQfoBMltPcHRpb25hbCA6IEVudGl0eSB0byBhcHBseSB0aGUgcmVzdHJpY3'
+    'Rpb24gcnVsZXMgKG9uIHRoZSBwYXRoIGRlZmluZWQgd2l0aCBVc2FnZUNvbnRleHRQYXRoSpoB'
+    'Rm9yIEFjdG9yLCB0byBsaW1pdCB0aGUgcmVzdWx0cyBhY2NvcmRpbmcgdG8gT3JkZXIgU2hpcE'
+    'Zyb20gcmVzdHJpY3Rpb24gcnVsZXMsIGRlZmluZSBVc2FnZUNvbnRleHRFbnRpdHkgdG8gT3Jk'
+    'ZXIgYW5kIFVzYWdlQ29udGV4dFBhdGggdG8gUGF5bG9hZC5TaGlwRnJvbVISVXNhZ2VDb250ZX'
+    'h0RW50aXR5EoQBChBVc2FnZUNvbnRleHRQYXRoGAkgASgJQliSQVUyU09wdGlvbmFsIDogUGF0'
+    'aCBvZiByZXN0cmljdGlvbiBydWxlIHRvIGFwcGx5IChVc2FnZUNvbnRleHRFbnRpdHkgc2hvdW'
+    'xkIGJlIGRlZmluZWQpUhBVc2FnZUNvbnRleHRQYXRoOg6SQQsKCdIBBkhlYWRlcg==');
 
 @$core.Deprecated('Use partnerByFilterResultDescriptor instead')
 const PartnerByFilterResult$json = {
diff --git a/lib/stockQuery.pb.dart b/lib/stockQuery.pb.dart
index b7cd1385..e5b8c6c9 100644
--- a/lib/stockQuery.pb.dart
+++ b/lib/stockQuery.pb.dart
@@ -148,6 +148,8 @@ class StockByFilterQuery extends $pb.GeneratedMessage {
     $core.String? queryContext,
     $core.Iterable<$1.BlockFilter>? blockFilters,
     StockQueryOptions? options,
+    $1.EntityType? usageContextEntity,
+    $core.String? usageContextPath,
   }) {
     final result = create();
     if (header != null) result.header = header;
@@ -155,6 +157,8 @@ class StockByFilterQuery extends $pb.GeneratedMessage {
     if (queryContext != null) result.queryContext = queryContext;
     if (blockFilters != null) result.blockFilters.addAll(blockFilters);
     if (options != null) result.options = options;
+    if (usageContextEntity != null) result.usageContextEntity = usageContextEntity;
+    if (usageContextPath != null) result.usageContextPath = usageContextPath;
     return result;
   }
 
@@ -169,6 +173,8 @@ class StockByFilterQuery extends $pb.GeneratedMessage {
     ..aOS(5, _omitFieldNames ? '' : 'queryContext', protoName: 'queryContext')
     ..pc<$1.BlockFilter>(7, _omitFieldNames ? '' : 'BlockFilters', $pb.PbFieldType.PM, protoName: 'BlockFilters', subBuilder: $1.BlockFilter.create)
     ..aOM<StockQueryOptions>(8, _omitFieldNames ? '' : 'Options', protoName: 'Options', subBuilder: StockQueryOptions.create)
+    ..e<$1.EntityType>(9, _omitFieldNames ? '' : 'UsageContextEntity', $pb.PbFieldType.OE, protoName: 'UsageContextEntity', defaultOrMaker: $1.EntityType.ENTITY_TYPE_UNKNOWN, valueOf: $1.EntityType.valueOf, enumValues: $1.EntityType.values)
+    ..aOS(10, _omitFieldNames ? '' : 'UsageContextPath', protoName: 'UsageContextPath')
     ..hasRequiredFields = false
   ;
 
@@ -233,6 +239,24 @@ class StockByFilterQuery extends $pb.GeneratedMessage {
   void clearOptions() => $_clearField(8);
   @$pb.TagNumber(8)
   StockQueryOptions ensureOptions() => $_ensure(4);
+
+  @$pb.TagNumber(9)
+  $1.EntityType get usageContextEntity => $_getN(5);
+  @$pb.TagNumber(9)
+  set usageContextEntity($1.EntityType value) => $_setField(9, value);
+  @$pb.TagNumber(9)
+  $core.bool hasUsageContextEntity() => $_has(5);
+  @$pb.TagNumber(9)
+  void clearUsageContextEntity() => $_clearField(9);
+
+  @$pb.TagNumber(10)
+  $core.String get usageContextPath => $_getSZ(6);
+  @$pb.TagNumber(10)
+  set usageContextPath($core.String value) => $_setString(6, value);
+  @$pb.TagNumber(10)
+  $core.bool hasUsageContextPath() => $_has(6);
+  @$pb.TagNumber(10)
+  void clearUsageContextPath() => $_clearField(10);
 }
 
 class StockByFilterResult extends $pb.GeneratedMessage {
diff --git a/lib/stockQuery.pbjson.dart b/lib/stockQuery.pbjson.dart
index 4694f2f6..38eb7857 100644
--- a/lib/stockQuery.pbjson.dart
+++ b/lib/stockQuery.pbjson.dart
@@ -56,6 +56,8 @@ const StockByFilterQuery$json = {
     {'1': 'queryContext', '3': 5, '4': 1, '5': 9, '10': 'queryContext'},
     {'1': 'BlockFilters', '3': 7, '4': 3, '5': 11, '6': '.api.BlockFilter', '10': 'BlockFilters'},
     {'1': 'Options', '3': 8, '4': 1, '5': 11, '6': '.api.StockQueryOptions', '10': 'Options'},
+    {'1': 'UsageContextEntity', '3': 9, '4': 1, '5': 14, '6': '.api.EntityType', '8': {}, '10': 'UsageContextEntity'},
+    {'1': 'UsageContextPath', '3': 10, '4': 1, '5': 9, '8': {}, '10': 'UsageContextPath'},
   ],
   '7': {},
 };
@@ -67,7 +69,15 @@ final $typed_data.Uint8List stockByFilterQueryDescriptor = $convert.base64Decode
     'ZXIgb2YgbWF4aW11bSByZXN1bHRKBSI1MDAiUgtsaW1pdEZpbHRlchIiCgxxdWVyeUNvbnRleH'
     'QYBSABKAlSDHF1ZXJ5Q29udGV4dBI0CgxCbG9ja0ZpbHRlcnMYByADKAsyEC5hcGkuQmxvY2tG'
     'aWx0ZXJSDEJsb2NrRmlsdGVycxIwCgdPcHRpb25zGAggASgLMhYuYXBpLlN0b2NrUXVlcnlPcH'
-    'Rpb25zUgdPcHRpb25zOg6SQQsKCdIBBkhlYWRlcg==');
+    'Rpb25zUgdPcHRpb25zEsACChJVc2FnZUNvbnRleHRFbnRpdHkYCSABKA4yDy5hcGkuRW50aXR5'
+    'VHlwZUL+AZJB+gEyW09wdGlvbmFsIDogRW50aXR5IHRvIGFwcGx5IHRoZSByZXN0cmljdGlvbi'
+    'BydWxlcyAob24gdGhlIHBhdGggZGVmaW5lZCB3aXRoIFVzYWdlQ29udGV4dFBhdGhKmgFGb3Ig'
+    'QWN0b3IsIHRvIGxpbWl0IHRoZSByZXN1bHRzIGFjY29yZGluZyB0byBPcmRlciBTaGlwRnJvbS'
+    'ByZXN0cmljdGlvbiBydWxlcywgZGVmaW5lIFVzYWdlQ29udGV4dEVudGl0eSB0byBPcmRlciBh'
+    'bmQgVXNhZ2VDb250ZXh0UGF0aCB0byBQYXlsb2FkLlNoaXBGcm9tUhJVc2FnZUNvbnRleHRFbn'
+    'RpdHkShAEKEFVzYWdlQ29udGV4dFBhdGgYCiABKAlCWJJBVTJTT3B0aW9uYWwgOiBQYXRoIG9m'
+    'IHJlc3RyaWN0aW9uIHJ1bGUgdG8gYXBwbHkgKFVzYWdlQ29udGV4dEVudGl0eSBzaG91bGQgYm'
+    'UgZGVmaW5lZClSEFVzYWdlQ29udGV4dFBhdGg6DpJBCwoJ0gEGSGVhZGVy');
 
 @$core.Deprecated('Use stockByFilterResultDescriptor instead')
 const StockByFilterResult$json = {
diff --git a/pubspec.yaml b/pubspec.yaml
index 8a86ba84..a5f4eecb 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: dart_core_sdk
 description: dart libs from core model proto files
-version: 1.12.0-SNAPSHOT-250925081438
+version: 1.12.0-SNAPSHOT-250925143331
 homepage: ''
 publish_to: ''
 repository: ''