Release 1.10.5

2025-05-16 12:41:43 +00:00
479 changed files with 56834 additions and 77782 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,3 @@
 # CHANGELOG

-Lib version: 1.11.3
+Lib version: 1.10.5
--- a/lib/accounts.pb.dart
+++ b/lib/accounts.pb.dart
--- a/lib/accounts.pbenum.dart
+++ b/lib/accounts.pbenum.dart
@@ -1,12 +1,11 @@
-// This is a generated file - do not edit.
 //
-// Generated from accounts.proto.
-
+//  Generated code. Do not modify.
+//  source: accounts.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

--- a/lib/accounts.pbgrpc.dart
+++ b/lib/accounts.pbgrpc.dart
@@ -1,14 +1,13 @@
-// This is a generated file - do not edit.
 //
-// Generated from accounts.proto.
-
+//  Generated code. Do not modify.
+//  source: accounts.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:async' as $async;
 import 'dart:core' as $core;
@@ -22,98 +21,88 @@ export 'accounts.pb.dart';

@$pb.GrpcServiceName('api.Accounts')
 class AccountsClient extends $grpc.Client {
-  /// The hostname for this service.
-  static const $core.String defaultHost = '';
-
-  /// OAuth scopes needed for the client.
-  static const $core.List<$core.String> oauthScopes = [
-    '',
-  ];
-
-  AccountsClient(super.channel, {super.options, super.interceptors});
-
-  $grpc.ResponseFuture<$0.CreateAccountResult> createAccount($0.CreateAccountRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$createAccount, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.GetAccountResult> getAccount($0.GetAccountRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$getAccount, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.ListAccountsResult> listAccounts($0.ListAccountsRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$listAccounts, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.EditAccountResult> editAccount($0.EditAccountRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$editAccount, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.DeleteAccountResult> deleteAccount($0.DeleteAccountRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$deleteAccount, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.PushAccountsResult> pushAccounts($0.PushAccountsRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$pushAccounts, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.AddExportResult> addExport($0.AddExportRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$addExport, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.AddImportResult> addImport($0.AddImportRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$addImport, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.DeleteExportResult> deleteExport($0.DeleteExportRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$deleteExport, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.DeleteImportResult> deleteImport($0.DeleteImportRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$deleteImport, request, options: options);
-  }
-
-    // method descriptors
-
  static final _$createAccount = $grpc.ClientMethod<$0.CreateAccountRequest, $0.CreateAccountResult>(
      '/api.Accounts/CreateAccount',
      ($0.CreateAccountRequest value) => value.writeToBuffer(),
-      $0.CreateAccountResult.fromBuffer);
+      ($core.List<$core.int> value) => $0.CreateAccountResult.fromBuffer(value));
  static final _$getAccount = $grpc.ClientMethod<$0.GetAccountRequest, $0.GetAccountResult>(
      '/api.Accounts/GetAccount',
      ($0.GetAccountRequest value) => value.writeToBuffer(),
-      $0.GetAccountResult.fromBuffer);
+      ($core.List<$core.int> value) => $0.GetAccountResult.fromBuffer(value));
  static final _$listAccounts = $grpc.ClientMethod<$0.ListAccountsRequest, $0.ListAccountsResult>(
      '/api.Accounts/ListAccounts',
      ($0.ListAccountsRequest value) => value.writeToBuffer(),
-      $0.ListAccountsResult.fromBuffer);
+      ($core.List<$core.int> value) => $0.ListAccountsResult.fromBuffer(value));
  static final _$editAccount = $grpc.ClientMethod<$0.EditAccountRequest, $0.EditAccountResult>(
      '/api.Accounts/EditAccount',
      ($0.EditAccountRequest value) => value.writeToBuffer(),
-      $0.EditAccountResult.fromBuffer);
+      ($core.List<$core.int> value) => $0.EditAccountResult.fromBuffer(value));
  static final _$deleteAccount = $grpc.ClientMethod<$0.DeleteAccountRequest, $0.DeleteAccountResult>(
      '/api.Accounts/DeleteAccount',
      ($0.DeleteAccountRequest value) => value.writeToBuffer(),
-      $0.DeleteAccountResult.fromBuffer);
+      ($core.List<$core.int> value) => $0.DeleteAccountResult.fromBuffer(value));
  static final _$pushAccounts = $grpc.ClientMethod<$0.PushAccountsRequest, $0.PushAccountsResult>(
      '/api.Accounts/PushAccounts',
      ($0.PushAccountsRequest value) => value.writeToBuffer(),
-      $0.PushAccountsResult.fromBuffer);
+      ($core.List<$core.int> value) => $0.PushAccountsResult.fromBuffer(value));
  static final _$addExport = $grpc.ClientMethod<$0.AddExportRequest, $0.AddExportResult>(
      '/api.Accounts/AddExport',
      ($0.AddExportRequest value) => value.writeToBuffer(),
-      $0.AddExportResult.fromBuffer);
+      ($core.List<$core.int> value) => $0.AddExportResult.fromBuffer(value));
  static final _$addImport = $grpc.ClientMethod<$0.AddImportRequest, $0.AddImportResult>(
      '/api.Accounts/AddImport',
      ($0.AddImportRequest value) => value.writeToBuffer(),
-      $0.AddImportResult.fromBuffer);
+      ($core.List<$core.int> value) => $0.AddImportResult.fromBuffer(value));
  static final _$deleteExport = $grpc.ClientMethod<$0.DeleteExportRequest, $0.DeleteExportResult>(
      '/api.Accounts/DeleteExport',
      ($0.DeleteExportRequest value) => value.writeToBuffer(),
-      $0.DeleteExportResult.fromBuffer);
+      ($core.List<$core.int> value) => $0.DeleteExportResult.fromBuffer(value));
  static final _$deleteImport = $grpc.ClientMethod<$0.DeleteImportRequest, $0.DeleteImportResult>(
      '/api.Accounts/DeleteImport',
      ($0.DeleteImportRequest value) => value.writeToBuffer(),
-      $0.DeleteImportResult.fromBuffer);
+      ($core.List<$core.int> value) => $0.DeleteImportResult.fromBuffer(value));
+
+  AccountsClient(super.channel, {super.options, super.interceptors});
+
+  $grpc.ResponseFuture<$0.CreateAccountResult> createAccount($0.CreateAccountRequest request, {$grpc.CallOptions? options}) {
+    return $createUnaryCall(_$createAccount, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$0.GetAccountResult> getAccount($0.GetAccountRequest request, {$grpc.CallOptions? options}) {
+    return $createUnaryCall(_$getAccount, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$0.ListAccountsResult> listAccounts($0.ListAccountsRequest request, {$grpc.CallOptions? options}) {
+    return $createUnaryCall(_$listAccounts, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$0.EditAccountResult> editAccount($0.EditAccountRequest request, {$grpc.CallOptions? options}) {
+    return $createUnaryCall(_$editAccount, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$0.DeleteAccountResult> deleteAccount($0.DeleteAccountRequest request, {$grpc.CallOptions? options}) {
+    return $createUnaryCall(_$deleteAccount, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$0.PushAccountsResult> pushAccounts($0.PushAccountsRequest request, {$grpc.CallOptions? options}) {
+    return $createUnaryCall(_$pushAccounts, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$0.AddExportResult> addExport($0.AddExportRequest request, {$grpc.CallOptions? options}) {
+    return $createUnaryCall(_$addExport, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$0.AddImportResult> addImport($0.AddImportRequest request, {$grpc.CallOptions? options}) {
+    return $createUnaryCall(_$addImport, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$0.DeleteExportResult> deleteExport($0.DeleteExportRequest request, {$grpc.CallOptions? options}) {
+    return $createUnaryCall(_$deleteExport, request, options: options);
+  }
+
+  $grpc.ResponseFuture<$0.DeleteImportResult> deleteImport($0.DeleteImportRequest request, {$grpc.CallOptions? options}) {
+    return $createUnaryCall(_$deleteImport, request, options: options);
+  }
 }

@$pb.GrpcServiceName('api.Accounts')
@@ -197,60 +186,50 @@ abstract class AccountsServiceBase extends $grpc.Service {
    return createAccount($call, await $request);
  }

-  $async.Future<$0.CreateAccountResult> createAccount($grpc.ServiceCall call, $0.CreateAccountRequest request);
-
  $async.Future<$0.GetAccountResult> getAccount_Pre($grpc.ServiceCall $call, $async.Future<$0.GetAccountRequest> $request) async {
    return getAccount($call, await $request);
  }

-  $async.Future<$0.GetAccountResult> getAccount($grpc.ServiceCall call, $0.GetAccountRequest request);
-
  $async.Future<$0.ListAccountsResult> listAccounts_Pre($grpc.ServiceCall $call, $async.Future<$0.ListAccountsRequest> $request) async {
    return listAccounts($call, await $request);
  }

-  $async.Future<$0.ListAccountsResult> listAccounts($grpc.ServiceCall call, $0.ListAccountsRequest request);
-
  $async.Future<$0.EditAccountResult> editAccount_Pre($grpc.ServiceCall $call, $async.Future<$0.EditAccountRequest> $request) async {
    return editAccount($call, await $request);
  }

-  $async.Future<$0.EditAccountResult> editAccount($grpc.ServiceCall call, $0.EditAccountRequest request);
-
  $async.Future<$0.DeleteAccountResult> deleteAccount_Pre($grpc.ServiceCall $call, $async.Future<$0.DeleteAccountRequest> $request) async {
    return deleteAccount($call, await $request);
  }

-  $async.Future<$0.DeleteAccountResult> deleteAccount($grpc.ServiceCall call, $0.DeleteAccountRequest request);
-
  $async.Future<$0.PushAccountsResult> pushAccounts_Pre($grpc.ServiceCall $call, $async.Future<$0.PushAccountsRequest> $request) async {
    return pushAccounts($call, await $request);
  }

-  $async.Future<$0.PushAccountsResult> pushAccounts($grpc.ServiceCall call, $0.PushAccountsRequest request);
-
  $async.Future<$0.AddExportResult> addExport_Pre($grpc.ServiceCall $call, $async.Future<$0.AddExportRequest> $request) async {
    return addExport($call, await $request);
  }

-  $async.Future<$0.AddExportResult> addExport($grpc.ServiceCall call, $0.AddExportRequest request);
-
  $async.Future<$0.AddImportResult> addImport_Pre($grpc.ServiceCall $call, $async.Future<$0.AddImportRequest> $request) async {
    return addImport($call, await $request);
  }

-  $async.Future<$0.AddImportResult> addImport($grpc.ServiceCall call, $0.AddImportRequest request);
-
  $async.Future<$0.DeleteExportResult> deleteExport_Pre($grpc.ServiceCall $call, $async.Future<$0.DeleteExportRequest> $request) async {
    return deleteExport($call, await $request);
  }

-  $async.Future<$0.DeleteExportResult> deleteExport($grpc.ServiceCall call, $0.DeleteExportRequest request);
-
  $async.Future<$0.DeleteImportResult> deleteImport_Pre($grpc.ServiceCall $call, $async.Future<$0.DeleteImportRequest> $request) async {
    return deleteImport($call, await $request);
  }

+  $async.Future<$0.CreateAccountResult> createAccount($grpc.ServiceCall call, $0.CreateAccountRequest request);
+  $async.Future<$0.GetAccountResult> getAccount($grpc.ServiceCall call, $0.GetAccountRequest request);
+  $async.Future<$0.ListAccountsResult> listAccounts($grpc.ServiceCall call, $0.ListAccountsRequest request);
+  $async.Future<$0.EditAccountResult> editAccount($grpc.ServiceCall call, $0.EditAccountRequest request);
+  $async.Future<$0.DeleteAccountResult> deleteAccount($grpc.ServiceCall call, $0.DeleteAccountRequest request);
+  $async.Future<$0.PushAccountsResult> pushAccounts($grpc.ServiceCall call, $0.PushAccountsRequest request);
+  $async.Future<$0.AddExportResult> addExport($grpc.ServiceCall call, $0.AddExportRequest request);
+  $async.Future<$0.AddImportResult> addImport($grpc.ServiceCall call, $0.AddImportRequest request);
+  $async.Future<$0.DeleteExportResult> deleteExport($grpc.ServiceCall call, $0.DeleteExportRequest request);
  $async.Future<$0.DeleteImportResult> deleteImport($grpc.ServiceCall call, $0.DeleteImportRequest request);
-
 }
--- a/lib/accounts.pbjson.dart
+++ b/lib/accounts.pbjson.dart
@@ -1,14 +1,13 @@
-// This is a generated file - do not edit.
 //
-// Generated from accounts.proto.
-
+//  Generated code. Do not modify.
+//  source: accounts.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
--- a/lib/actor.pb.dart
+++ b/lib/actor.pb.dart
@@ -1,23 +1,22 @@
-// This is a generated file - do not edit.
 //
-// Generated from actor.proto.
-
+//  Generated code. Do not modify.
+//  source: actor.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:core' as $core;

 import 'package:protobuf/protobuf.dart' as $pb;

-import 'partner.pb.dart' as $3;
-import 'repositoryShared.pb.dart' as $1;
-import 'shared.pb.dart' as $0;
-import 'slotbooking.pb.dart' as $2;
+import 'partner.pb.dart' as $66;
+import 'repositoryShared.pb.dart' as $65;
+import 'repositoryShared.pbenum.dart' as $65;
+import 'shared.pb.dart' as $3;

 export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;

@@ -25,40 +24,48 @@ export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
 /// Aggregation object message
 class Actor extends $pb.GeneratedMessage {
  factory Actor({
-    $0.EventHeader? lastEventHeader,
-    $0.EntityID? iD,
+    $3.EventHeader? lastEventHeader,
+    $3.EntityID? iD,
    ActorPayload? payload,
  }) {
-    final result = create();
-    if (lastEventHeader != null) result.lastEventHeader = lastEventHeader;
-    if (iD != null) result.iD = iD;
-    if (payload != null) result.payload = payload;
-    return result;
+    final $result = create();
+    if (lastEventHeader != null) {
+      $result.lastEventHeader = lastEventHeader;
+    }
+    if (iD != null) {
+      $result.iD = iD;
+    }
+    if (payload != null) {
+      $result.payload = payload;
+    }
+    return $result;
  }
-
-  Actor._();
-
-  factory Actor.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory Actor.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  Actor._() : super();
+  factory Actor.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory Actor.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Actor', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$0.EventHeader>(1, _omitFieldNames ? '' : 'LastEventHeader', protoName: 'LastEventHeader', subBuilder: $0.EventHeader.create)
-    ..aOM<$0.EntityID>(2, _omitFieldNames ? '' : 'ID', protoName: 'ID', subBuilder: $0.EntityID.create)
+    ..aOM<$3.EventHeader>(1, _omitFieldNames ? '' : 'LastEventHeader', protoName: 'LastEventHeader', subBuilder: $3.EventHeader.create)
+    ..aOM<$3.EntityID>(2, _omitFieldNames ? '' : 'ID', protoName: 'ID', subBuilder: $3.EntityID.create)
    ..aOM<ActorPayload>(3, _omitFieldNames ? '' : 'Payload', protoName: 'Payload', subBuilder: ActorPayload.create)
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  Actor clone() => Actor()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  Actor copyWith(void Function(Actor) updates) => super.copyWith((message) => updates(message as Actor)) as Actor;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static Actor create() => Actor._();
-  @$core.override
  Actor createEmptyInstance() => create();
  static $pb.PbList<Actor> createRepeated() => $pb.PbList<Actor>();
  @$core.pragma('dart2js:noInline')
@@ -66,31 +73,31 @@ class Actor extends $pb.GeneratedMessage {
  static Actor? _defaultInstance;

  @$pb.TagNumber(1)
-  $0.EventHeader get lastEventHeader => $_getN(0);
+  $3.EventHeader get lastEventHeader => $_getN(0);
  @$pb.TagNumber(1)
-  set lastEventHeader($0.EventHeader value) => $_setField(1, value);
+  set lastEventHeader($3.EventHeader v) { $_setField(1, v); }
  @$pb.TagNumber(1)
  $core.bool hasLastEventHeader() => $_has(0);
  @$pb.TagNumber(1)
  void clearLastEventHeader() => $_clearField(1);
  @$pb.TagNumber(1)
-  $0.EventHeader ensureLastEventHeader() => $_ensure(0);
+  $3.EventHeader ensureLastEventHeader() => $_ensure(0);

  @$pb.TagNumber(2)
-  $0.EntityID get iD => $_getN(1);
+  $3.EntityID get iD => $_getN(1);
  @$pb.TagNumber(2)
-  set iD($0.EntityID value) => $_setField(2, value);
+  set iD($3.EntityID v) { $_setField(2, v); }
  @$pb.TagNumber(2)
  $core.bool hasID() => $_has(1);
  @$pb.TagNumber(2)
  void clearID() => $_clearField(2);
  @$pb.TagNumber(2)
-  $0.EntityID ensureID() => $_ensure(1);
+  $3.EntityID ensureID() => $_ensure(1);

  @$pb.TagNumber(3)
  ActorPayload get payload => $_getN(2);
  @$pb.TagNumber(3)
-  set payload(ActorPayload value) => $_setField(3, value);
+  set payload(ActorPayload v) { $_setField(3, v); }
  @$pb.TagNumber(3)
  $core.bool hasPayload() => $_has(2);
  @$pb.TagNumber(3)
@@ -102,111 +109,152 @@ class Actor extends $pb.GeneratedMessage {
 class ActorPayload extends $pb.GeneratedMessage {
  factory ActorPayload({
    $core.String? name,
-    $1.IdType? idType,
-    $core.Iterable<$0.MetadataElement>? metaData,
-    $1.Address? address,
-    $1.ActorStatusStruct? status,
+    $65.IdType? idType,
+    $core.Iterable<$3.MetadataElement>? metaData,
+    $65.Address? address,
+    $65.ActorStatusStruct? status,
    $core.String? partnerID,
-    $1.ActorTypology? typology,
-    $1.ActorSnapshot? snapshot,
+    $65.ActorTypology? typology,
+    $65.ActorSnapshot? snapshot,
    $core.Iterable<$core.String>? emails,
    $core.Iterable<$core.String>? phones,
    $core.bool? managedStock,
    $core.String? additionalInformation,
    $core.bool? isCarrier,
-    $core.Iterable<$1.CarrierService>? carrierServices,
+    $core.Iterable<$65.CarrierService>? carrierServices,
    $core.bool? isShipToConnected,
    $core.bool? isShipFromConnected,
    $core.String? shipToPartnerAppID,
    $core.String? shipFromPartnerAppID,
-    $core.Iterable<$0.AttachmentSummary>? attachments,
+    $core.Iterable<$3.AttachmentSummary>? attachments,
    $core.int? attachmentNumber,
-    $core.Iterable<$0.ClaimSummary>? claims,
+    $core.Iterable<$3.ClaimSummary>? claims,
    $core.int? claimNumber,
    $core.String? photoURI,
    $core.Iterable<$core.String>? connectionIdentifierPrefixes,
-    $core.bool? isSlotBookingEnabled,
-    $1.SiteAlias? siteAlias,
-    $2.ActorAuthorisation? appointmentConstraints,
  }) {
-    final result = create();
-    if (name != null) result.name = name;
-    if (idType != null) result.idType = idType;
-    if (metaData != null) result.metaData.addAll(metaData);
-    if (address != null) result.address = address;
-    if (status != null) result.status = status;
-    if (partnerID != null) result.partnerID = partnerID;
-    if (typology != null) result.typology = typology;
-    if (snapshot != null) result.snapshot = snapshot;
-    if (emails != null) result.emails.addAll(emails);
-    if (phones != null) result.phones.addAll(phones);
-    if (managedStock != null) result.managedStock = managedStock;
-    if (additionalInformation != null) result.additionalInformation = additionalInformation;
-    if (isCarrier != null) result.isCarrier = isCarrier;
-    if (carrierServices != null) result.carrierServices.addAll(carrierServices);
-    if (isShipToConnected != null) result.isShipToConnected = isShipToConnected;
-    if (isShipFromConnected != null) result.isShipFromConnected = isShipFromConnected;
-    if (shipToPartnerAppID != null) result.shipToPartnerAppID = shipToPartnerAppID;
-    if (shipFromPartnerAppID != null) result.shipFromPartnerAppID = shipFromPartnerAppID;
-    if (attachments != null) result.attachments.addAll(attachments);
-    if (attachmentNumber != null) result.attachmentNumber = attachmentNumber;
-    if (claims != null) result.claims.addAll(claims);
-    if (claimNumber != null) result.claimNumber = claimNumber;
-    if (photoURI != null) result.photoURI = photoURI;
-    if (connectionIdentifierPrefixes != null) result.connectionIdentifierPrefixes.addAll(connectionIdentifierPrefixes);
-    if (isSlotBookingEnabled != null) result.isSlotBookingEnabled = isSlotBookingEnabled;
-    if (siteAlias != null) result.siteAlias = siteAlias;
-    if (appointmentConstraints != null) result.appointmentConstraints = appointmentConstraints;
-    return result;
+    final $result = create();
+    if (name != null) {
+      $result.name = name;
+    }
+    if (idType != null) {
+      $result.idType = idType;
+    }
+    if (metaData != null) {
+      $result.metaData.addAll(metaData);
+    }
+    if (address != null) {
+      $result.address = address;
+    }
+    if (status != null) {
+      $result.status = status;
+    }
+    if (partnerID != null) {
+      $result.partnerID = partnerID;
+    }
+    if (typology != null) {
+      $result.typology = typology;
+    }
+    if (snapshot != null) {
+      $result.snapshot = snapshot;
+    }
+    if (emails != null) {
+      $result.emails.addAll(emails);
+    }
+    if (phones != null) {
+      $result.phones.addAll(phones);
+    }
+    if (managedStock != null) {
+      $result.managedStock = managedStock;
+    }
+    if (additionalInformation != null) {
+      $result.additionalInformation = additionalInformation;
+    }
+    if (isCarrier != null) {
+      $result.isCarrier = isCarrier;
+    }
+    if (carrierServices != null) {
+      $result.carrierServices.addAll(carrierServices);
+    }
+    if (isShipToConnected != null) {
+      $result.isShipToConnected = isShipToConnected;
+    }
+    if (isShipFromConnected != null) {
+      $result.isShipFromConnected = isShipFromConnected;
+    }
+    if (shipToPartnerAppID != null) {
+      $result.shipToPartnerAppID = shipToPartnerAppID;
+    }
+    if (shipFromPartnerAppID != null) {
+      $result.shipFromPartnerAppID = shipFromPartnerAppID;
+    }
+    if (attachments != null) {
+      $result.attachments.addAll(attachments);
+    }
+    if (attachmentNumber != null) {
+      $result.attachmentNumber = attachmentNumber;
+    }
+    if (claims != null) {
+      $result.claims.addAll(claims);
+    }
+    if (claimNumber != null) {
+      $result.claimNumber = claimNumber;
+    }
+    if (photoURI != null) {
+      $result.photoURI = photoURI;
+    }
+    if (connectionIdentifierPrefixes != null) {
+      $result.connectionIdentifierPrefixes.addAll(connectionIdentifierPrefixes);
+    }
+    return $result;
  }
-
-  ActorPayload._();
-
-  factory ActorPayload.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory ActorPayload.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  ActorPayload._() : super();
+  factory ActorPayload.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory ActorPayload.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ActorPayload', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
    ..aOS(1, _omitFieldNames ? '' : 'Name', protoName: 'Name')
-    ..e<$1.IdType>(2, _omitFieldNames ? '' : 'IdType', $pb.PbFieldType.OE, protoName: 'IdType', defaultOrMaker: $1.IdType.IDTYPE_UNKNOWN, valueOf: $1.IdType.valueOf, enumValues: $1.IdType.values)
-    ..pc<$0.MetadataElement>(3, _omitFieldNames ? '' : 'MetaData', $pb.PbFieldType.PM, protoName: 'MetaData', subBuilder: $0.MetadataElement.create)
-    ..aOM<$1.Address>(4, _omitFieldNames ? '' : 'Address', protoName: 'Address', subBuilder: $1.Address.create)
-    ..aOM<$1.ActorStatusStruct>(6, _omitFieldNames ? '' : 'Status', protoName: 'Status', subBuilder: $1.ActorStatusStruct.create)
+    ..e<$65.IdType>(2, _omitFieldNames ? '' : 'IdType', $pb.PbFieldType.OE, protoName: 'IdType', defaultOrMaker: $65.IdType.IDTYPE_UNKNOWN, valueOf: $65.IdType.valueOf, enumValues: $65.IdType.values)
+    ..pc<$3.MetadataElement>(3, _omitFieldNames ? '' : 'MetaData', $pb.PbFieldType.PM, protoName: 'MetaData', subBuilder: $3.MetadataElement.create)
+    ..aOM<$65.Address>(4, _omitFieldNames ? '' : 'Address', protoName: 'Address', subBuilder: $65.Address.create)
+    ..aOM<$65.ActorStatusStruct>(6, _omitFieldNames ? '' : 'Status', protoName: 'Status', subBuilder: $65.ActorStatusStruct.create)
    ..aOS(7, _omitFieldNames ? '' : 'PartnerID', protoName: 'PartnerID')
-    ..e<$1.ActorTypology>(10, _omitFieldNames ? '' : 'Typology', $pb.PbFieldType.OE, protoName: 'Typology', defaultOrMaker: $1.ActorTypology.TYPOLOGY_UNKNOWN, valueOf: $1.ActorTypology.valueOf, enumValues: $1.ActorTypology.values)
-    ..aOM<$1.ActorSnapshot>(11, _omitFieldNames ? '' : 'Snapshot', protoName: 'Snapshot', subBuilder: $1.ActorSnapshot.create)
+    ..e<$65.ActorTypology>(10, _omitFieldNames ? '' : 'Typology', $pb.PbFieldType.OE, protoName: 'Typology', defaultOrMaker: $65.ActorTypology.TYPOLOGY_UNKNOWN, valueOf: $65.ActorTypology.valueOf, enumValues: $65.ActorTypology.values)
+    ..aOM<$65.ActorSnapshot>(11, _omitFieldNames ? '' : 'Snapshot', protoName: 'Snapshot', subBuilder: $65.ActorSnapshot.create)
    ..pPS(12, _omitFieldNames ? '' : 'Emails', protoName: 'Emails')
    ..pPS(13, _omitFieldNames ? '' : 'Phones', protoName: 'Phones')
    ..aOB(14, _omitFieldNames ? '' : 'ManagedStock', protoName: 'ManagedStock')
    ..aOS(15, _omitFieldNames ? '' : 'AdditionalInformation', protoName: 'AdditionalInformation')
    ..aOB(16, _omitFieldNames ? '' : 'IsCarrier', protoName: 'IsCarrier')
-    ..pc<$1.CarrierService>(17, _omitFieldNames ? '' : 'CarrierServices', $pb.PbFieldType.PM, protoName: 'CarrierServices', subBuilder: $1.CarrierService.create)
+    ..pc<$65.CarrierService>(17, _omitFieldNames ? '' : 'CarrierServices', $pb.PbFieldType.PM, protoName: 'CarrierServices', subBuilder: $65.CarrierService.create)
    ..aOB(18, _omitFieldNames ? '' : 'IsShipToConnected', protoName: 'IsShipToConnected')
    ..aOB(19, _omitFieldNames ? '' : 'IsShipFromConnected', protoName: 'IsShipFromConnected')
    ..aOS(20, _omitFieldNames ? '' : 'ShipToPartnerAppID', protoName: 'ShipToPartnerAppID')
    ..aOS(21, _omitFieldNames ? '' : 'ShipFromPartnerAppID', protoName: 'ShipFromPartnerAppID')
-    ..pc<$0.AttachmentSummary>(22, _omitFieldNames ? '' : 'Attachments', $pb.PbFieldType.PM, protoName: 'Attachments', subBuilder: $0.AttachmentSummary.create)
+    ..pc<$3.AttachmentSummary>(22, _omitFieldNames ? '' : 'Attachments', $pb.PbFieldType.PM, protoName: 'Attachments', subBuilder: $3.AttachmentSummary.create)
    ..a<$core.int>(23, _omitFieldNames ? '' : 'AttachmentNumber', $pb.PbFieldType.O3, protoName: 'AttachmentNumber')
-    ..pc<$0.ClaimSummary>(24, _omitFieldNames ? '' : 'Claims', $pb.PbFieldType.PM, protoName: 'Claims', subBuilder: $0.ClaimSummary.create)
+    ..pc<$3.ClaimSummary>(24, _omitFieldNames ? '' : 'Claims', $pb.PbFieldType.PM, protoName: 'Claims', subBuilder: $3.ClaimSummary.create)
    ..a<$core.int>(25, _omitFieldNames ? '' : 'ClaimNumber', $pb.PbFieldType.O3, protoName: 'ClaimNumber')
    ..aOS(26, _omitFieldNames ? '' : 'PhotoURI', protoName: 'PhotoURI')
    ..pPS(28, _omitFieldNames ? '' : 'ConnectionIdentifierPrefixes', protoName: 'ConnectionIdentifierPrefixes')
-    ..aOB(29, _omitFieldNames ? '' : 'IsSlotBookingEnabled', protoName: 'IsSlotBookingEnabled')
-    ..aOM<$1.SiteAlias>(30, _omitFieldNames ? '' : 'SiteAlias', protoName: 'SiteAlias', subBuilder: $1.SiteAlias.create)
-    ..aOM<$2.ActorAuthorisation>(31, _omitFieldNames ? '' : 'AppointmentConstraints', protoName: 'AppointmentConstraints', subBuilder: $2.ActorAuthorisation.create)
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  ActorPayload clone() => ActorPayload()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  ActorPayload copyWith(void Function(ActorPayload) updates) => super.copyWith((message) => updates(message as ActorPayload)) as ActorPayload;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static ActorPayload create() => ActorPayload._();
-  @$core.override
  ActorPayload createEmptyInstance() => create();
  static $pb.PbList<ActorPayload> createRepeated() => $pb.PbList<ActorPayload>();
  @$core.pragma('dart2js:noInline')
@@ -217,76 +265,76 @@ class ActorPayload extends $pb.GeneratedMessage {
  @$pb.TagNumber(1)
  $core.String get name => $_getSZ(0);
  @$pb.TagNumber(1)
-  set name($core.String value) => $_setString(0, value);
+  set name($core.String v) { $_setString(0, v); }
  @$pb.TagNumber(1)
  $core.bool hasName() => $_has(0);
  @$pb.TagNumber(1)
  void clearName() => $_clearField(1);

  @$pb.TagNumber(2)
-  $1.IdType get idType => $_getN(1);
+  $65.IdType get idType => $_getN(1);
  @$pb.TagNumber(2)
-  set idType($1.IdType value) => $_setField(2, value);
+  set idType($65.IdType v) { $_setField(2, v); }
  @$pb.TagNumber(2)
  $core.bool hasIdType() => $_has(1);
  @$pb.TagNumber(2)
  void clearIdType() => $_clearField(2);

  @$pb.TagNumber(3)
-  $pb.PbList<$0.MetadataElement> get metaData => $_getList(2);
+  $pb.PbList<$3.MetadataElement> get metaData => $_getList(2);

  @$pb.TagNumber(4)
-  $1.Address get address => $_getN(3);
+  $65.Address get address => $_getN(3);
  @$pb.TagNumber(4)
-  set address($1.Address value) => $_setField(4, value);
+  set address($65.Address v) { $_setField(4, v); }
  @$pb.TagNumber(4)
  $core.bool hasAddress() => $_has(3);
  @$pb.TagNumber(4)
  void clearAddress() => $_clearField(4);
  @$pb.TagNumber(4)
-  $1.Address ensureAddress() => $_ensure(3);
+  $65.Address ensureAddress() => $_ensure(3);

  /// Status field is not accessible from APIs
  @$pb.TagNumber(6)
-  $1.ActorStatusStruct get status => $_getN(4);
+  $65.ActorStatusStruct get status => $_getN(4);
  @$pb.TagNumber(6)
-  set status($1.ActorStatusStruct value) => $_setField(6, value);
+  set status($65.ActorStatusStruct v) { $_setField(6, v); }
  @$pb.TagNumber(6)
  $core.bool hasStatus() => $_has(4);
  @$pb.TagNumber(6)
  void clearStatus() => $_clearField(6);
  @$pb.TagNumber(6)
-  $1.ActorStatusStruct ensureStatus() => $_ensure(4);
+  $65.ActorStatusStruct ensureStatus() => $_ensure(4);

  /// Existing PartnerID
  @$pb.TagNumber(7)
  $core.String get partnerID => $_getSZ(5);
  @$pb.TagNumber(7)
-  set partnerID($core.String value) => $_setString(5, value);
+  set partnerID($core.String v) { $_setString(5, v); }
  @$pb.TagNumber(7)
  $core.bool hasPartnerID() => $_has(5);
  @$pb.TagNumber(7)
  void clearPartnerID() => $_clearField(7);

  @$pb.TagNumber(10)
-  $1.ActorTypology get typology => $_getN(6);
+  $65.ActorTypology get typology => $_getN(6);
  @$pb.TagNumber(10)
-  set typology($1.ActorTypology value) => $_setField(10, value);
+  set typology($65.ActorTypology v) { $_setField(10, v); }
  @$pb.TagNumber(10)
  $core.bool hasTypology() => $_has(6);
  @$pb.TagNumber(10)
  void clearTypology() => $_clearField(10);

  @$pb.TagNumber(11)
-  $1.ActorSnapshot get snapshot => $_getN(7);
+  $65.ActorSnapshot get snapshot => $_getN(7);
  @$pb.TagNumber(11)
-  set snapshot($1.ActorSnapshot value) => $_setField(11, value);
+  set snapshot($65.ActorSnapshot v) { $_setField(11, v); }
  @$pb.TagNumber(11)
  $core.bool hasSnapshot() => $_has(7);
  @$pb.TagNumber(11)
  void clearSnapshot() => $_clearField(11);
  @$pb.TagNumber(11)
-  $1.ActorSnapshot ensureSnapshot() => $_ensure(7);
+  $65.ActorSnapshot ensureSnapshot() => $_ensure(7);

  /// Must be a valid email address
  @$pb.TagNumber(12)
@@ -299,7 +347,7 @@ class ActorPayload extends $pb.GeneratedMessage {
  @$pb.TagNumber(14)
  $core.bool get managedStock => $_getBF(10);
  @$pb.TagNumber(14)
-  set managedStock($core.bool value) => $_setBool(10, value);
+  set managedStock($core.bool v) { $_setBool(10, v); }
  @$pb.TagNumber(14)
  $core.bool hasManagedStock() => $_has(10);
  @$pb.TagNumber(14)
@@ -308,7 +356,7 @@ class ActorPayload extends $pb.GeneratedMessage {
  @$pb.TagNumber(15)
  $core.String get additionalInformation => $_getSZ(11);
  @$pb.TagNumber(15)
-  set additionalInformation($core.String value) => $_setString(11, value);
+  set additionalInformation($core.String v) { $_setString(11, v); }
  @$pb.TagNumber(15)
  $core.bool hasAdditionalInformation() => $_has(11);
  @$pb.TagNumber(15)
@@ -318,7 +366,7 @@ class ActorPayload extends $pb.GeneratedMessage {
  @$pb.TagNumber(16)
  $core.bool get isCarrier => $_getBF(12);
  @$pb.TagNumber(16)
-  set isCarrier($core.bool value) => $_setBool(12, value);
+  set isCarrier($core.bool v) { $_setBool(12, v); }
  @$pb.TagNumber(16)
  $core.bool hasIsCarrier() => $_has(12);
  @$pb.TagNumber(16)
@@ -326,12 +374,12 @@ class ActorPayload extends $pb.GeneratedMessage {

  /// List of carrier services
  @$pb.TagNumber(17)
-  $pb.PbList<$1.CarrierService> get carrierServices => $_getList(13);
+  $pb.PbList<$65.CarrierService> get carrierServices => $_getList(13);

  @$pb.TagNumber(18)
  $core.bool get isShipToConnected => $_getBF(14);
  @$pb.TagNumber(18)
-  set isShipToConnected($core.bool value) => $_setBool(14, value);
+  set isShipToConnected($core.bool v) { $_setBool(14, v); }
  @$pb.TagNumber(18)
  $core.bool hasIsShipToConnected() => $_has(14);
  @$pb.TagNumber(18)
@@ -340,7 +388,7 @@ class ActorPayload extends $pb.GeneratedMessage {
  @$pb.TagNumber(19)
  $core.bool get isShipFromConnected => $_getBF(15);
  @$pb.TagNumber(19)
-  set isShipFromConnected($core.bool value) => $_setBool(15, value);
+  set isShipFromConnected($core.bool v) { $_setBool(15, v); }
  @$pb.TagNumber(19)
  $core.bool hasIsShipFromConnected() => $_has(15);
  @$pb.TagNumber(19)
@@ -350,7 +398,7 @@ class ActorPayload extends $pb.GeneratedMessage {
  @$pb.TagNumber(20)
  $core.String get shipToPartnerAppID => $_getSZ(16);
  @$pb.TagNumber(20)
-  set shipToPartnerAppID($core.String value) => $_setString(16, value);
+  set shipToPartnerAppID($core.String v) { $_setString(16, v); }
  @$pb.TagNumber(20)
  $core.bool hasShipToPartnerAppID() => $_has(16);
  @$pb.TagNumber(20)
@@ -360,31 +408,31 @@ class ActorPayload extends $pb.GeneratedMessage {
  @$pb.TagNumber(21)
  $core.String get shipFromPartnerAppID => $_getSZ(17);
  @$pb.TagNumber(21)
-  set shipFromPartnerAppID($core.String value) => $_setString(17, value);
+  set shipFromPartnerAppID($core.String v) { $_setString(17, v); }
  @$pb.TagNumber(21)
  $core.bool hasShipFromPartnerAppID() => $_has(17);
  @$pb.TagNumber(21)
  void clearShipFromPartnerAppID() => $_clearField(21);

  @$pb.TagNumber(22)
-  $pb.PbList<$0.AttachmentSummary> get attachments => $_getList(18);
+  $pb.PbList<$3.AttachmentSummary> get attachments => $_getList(18);

  @$pb.TagNumber(23)
  $core.int get attachmentNumber => $_getIZ(19);
  @$pb.TagNumber(23)
-  set attachmentNumber($core.int value) => $_setSignedInt32(19, value);
+  set attachmentNumber($core.int v) { $_setSignedInt32(19, v); }
  @$pb.TagNumber(23)
  $core.bool hasAttachmentNumber() => $_has(19);
  @$pb.TagNumber(23)
  void clearAttachmentNumber() => $_clearField(23);

  @$pb.TagNumber(24)
-  $pb.PbList<$0.ClaimSummary> get claims => $_getList(20);
+  $pb.PbList<$3.ClaimSummary> get claims => $_getList(20);

  @$pb.TagNumber(25)
  $core.int get claimNumber => $_getIZ(21);
  @$pb.TagNumber(25)
-  set claimNumber($core.int value) => $_setSignedInt32(21, value);
+  set claimNumber($core.int v) { $_setSignedInt32(21, v); }
  @$pb.TagNumber(25)
  $core.bool hasClaimNumber() => $_has(21);
  @$pb.TagNumber(25)
@@ -393,7 +441,7 @@ class ActorPayload extends $pb.GeneratedMessage {
  @$pb.TagNumber(26)
  $core.String get photoURI => $_getSZ(22);
  @$pb.TagNumber(26)
-  set photoURI($core.String value) => $_setString(22, value);
+  set photoURI($core.String v) { $_setString(22, v); }
  @$pb.TagNumber(26)
  $core.bool hasPhotoURI() => $_has(22);
  @$pb.TagNumber(26)
@@ -402,37 +450,6 @@ class ActorPayload extends $pb.GeneratedMessage {
  /// Prefix used to create executionflow identifiers
  @$pb.TagNumber(28)
  $pb.PbList<$core.String> get connectionIdentifierPrefixes => $_getList(23);
-
-  @$pb.TagNumber(29)
-  $core.bool get isSlotBookingEnabled => $_getBF(24);
-  @$pb.TagNumber(29)
-  set isSlotBookingEnabled($core.bool value) => $_setBool(24, value);
-  @$pb.TagNumber(29)
-  $core.bool hasIsSlotBookingEnabled() => $_has(24);
-  @$pb.TagNumber(29)
-  void clearIsSlotBookingEnabled() => $_clearField(29);
-
-  @$pb.TagNumber(30)
-  $1.SiteAlias get siteAlias => $_getN(25);
-  @$pb.TagNumber(30)
-  set siteAlias($1.SiteAlias value) => $_setField(30, value);
-  @$pb.TagNumber(30)
-  $core.bool hasSiteAlias() => $_has(25);
-  @$pb.TagNumber(30)
-  void clearSiteAlias() => $_clearField(30);
-  @$pb.TagNumber(30)
-  $1.SiteAlias ensureSiteAlias() => $_ensure(25);
-
-  @$pb.TagNumber(31)
-  $2.ActorAuthorisation get appointmentConstraints => $_getN(26);
-  @$pb.TagNumber(31)
-  set appointmentConstraints($2.ActorAuthorisation value) => $_setField(31, value);
-  @$pb.TagNumber(31)
-  $core.bool hasAppointmentConstraints() => $_has(26);
-  @$pb.TagNumber(31)
-  void clearAppointmentConstraints() => $_clearField(31);
-  @$pb.TagNumber(31)
-  $2.ActorAuthorisation ensureAppointmentConstraints() => $_ensure(26);
 }

 enum ActorEnrichment_Content {
@@ -451,25 +468,41 @@ class ActorEnrichment extends $pb.GeneratedMessage {
    $core.String? project,
    $core.String? parentEntityName,
    $core.String? parentEntityID,
-    $3.PartnerPayload? partner,
+    $66.PartnerPayload? partner,
  }) {
-    final result = create();
-    if (parentEventID != null) result.parentEventID = parentEventID;
-    if (entityName != null) result.entityName = entityName;
-    if (entityRefID != null) result.entityRefID = entityRefID;
-    if (refFilter != null) result.refFilter = refFilter;
-    if (mergePath != null) result.mergePath = mergePath;
-    if (project != null) result.project = project;
-    if (parentEntityName != null) result.parentEntityName = parentEntityName;
-    if (parentEntityID != null) result.parentEntityID = parentEntityID;
-    if (partner != null) result.partner = partner;
-    return result;
+    final $result = create();
+    if (parentEventID != null) {
+      $result.parentEventID = parentEventID;
+    }
+    if (entityName != null) {
+      $result.entityName = entityName;
+    }
+    if (entityRefID != null) {
+      $result.entityRefID = entityRefID;
+    }
+    if (refFilter != null) {
+      $result.refFilter = refFilter;
+    }
+    if (mergePath != null) {
+      $result.mergePath = mergePath;
+    }
+    if (project != null) {
+      $result.project = project;
+    }
+    if (parentEntityName != null) {
+      $result.parentEntityName = parentEntityName;
+    }
+    if (parentEntityID != null) {
+      $result.parentEntityID = parentEntityID;
+    }
+    if (partner != null) {
+      $result.partner = partner;
+    }
+    return $result;
  }
-
-  ActorEnrichment._();
-
-  factory ActorEnrichment.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory ActorEnrichment.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  ActorEnrichment._() : super();
+  factory ActorEnrichment.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory ActorEnrichment.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static const $core.Map<$core.int, ActorEnrichment_Content> _ActorEnrichment_ContentByTag = {
    10 : ActorEnrichment_Content.partner,
@@ -485,21 +518,25 @@ class ActorEnrichment extends $pb.GeneratedMessage {
    ..aOS(6, _omitFieldNames ? '' : 'Project', protoName: 'Project')
    ..aOS(7, _omitFieldNames ? '' : 'ParentEntityName', protoName: 'ParentEntityName')
    ..aOS(8, _omitFieldNames ? '' : 'ParentEntityID', protoName: 'ParentEntityID')
-    ..aOM<$3.PartnerPayload>(10, _omitFieldNames ? '' : 'Partner', protoName: 'Partner', subBuilder: $3.PartnerPayload.create)
+    ..aOM<$66.PartnerPayload>(10, _omitFieldNames ? '' : 'Partner', protoName: 'Partner', subBuilder: $66.PartnerPayload.create)
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  ActorEnrichment clone() => ActorEnrichment()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  ActorEnrichment copyWith(void Function(ActorEnrichment) updates) => super.copyWith((message) => updates(message as ActorEnrichment)) as ActorEnrichment;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static ActorEnrichment create() => ActorEnrichment._();
-  @$core.override
  ActorEnrichment createEmptyInstance() => create();
  static $pb.PbList<ActorEnrichment> createRepeated() => $pb.PbList<ActorEnrichment>();
  @$core.pragma('dart2js:noInline')
@@ -512,7 +549,7 @@ class ActorEnrichment extends $pb.GeneratedMessage {
  @$pb.TagNumber(1)
  $core.String get parentEventID => $_getSZ(0);
  @$pb.TagNumber(1)
-  set parentEventID($core.String value) => $_setString(0, value);
+  set parentEventID($core.String v) { $_setString(0, v); }
  @$pb.TagNumber(1)
  $core.bool hasParentEventID() => $_has(0);
  @$pb.TagNumber(1)
@@ -521,7 +558,7 @@ class ActorEnrichment extends $pb.GeneratedMessage {
  @$pb.TagNumber(2)
  $core.String get entityName => $_getSZ(1);
  @$pb.TagNumber(2)
-  set entityName($core.String value) => $_setString(1, value);
+  set entityName($core.String v) { $_setString(1, v); }
  @$pb.TagNumber(2)
  $core.bool hasEntityName() => $_has(1);
  @$pb.TagNumber(2)
@@ -530,7 +567,7 @@ class ActorEnrichment extends $pb.GeneratedMessage {
  @$pb.TagNumber(3)
  $core.String get entityRefID => $_getSZ(2);
  @$pb.TagNumber(3)
-  set entityRefID($core.String value) => $_setString(2, value);
+  set entityRefID($core.String v) { $_setString(2, v); }
  @$pb.TagNumber(3)
  $core.bool hasEntityRefID() => $_has(2);
  @$pb.TagNumber(3)
@@ -539,7 +576,7 @@ class ActorEnrichment extends $pb.GeneratedMessage {
  @$pb.TagNumber(4)
  $core.String get refFilter => $_getSZ(3);
  @$pb.TagNumber(4)
-  set refFilter($core.String value) => $_setString(3, value);
+  set refFilter($core.String v) { $_setString(3, v); }
  @$pb.TagNumber(4)
  $core.bool hasRefFilter() => $_has(3);
  @$pb.TagNumber(4)
@@ -548,7 +585,7 @@ class ActorEnrichment extends $pb.GeneratedMessage {
  @$pb.TagNumber(5)
  $core.String get mergePath => $_getSZ(4);
  @$pb.TagNumber(5)
-  set mergePath($core.String value) => $_setString(4, value);
+  set mergePath($core.String v) { $_setString(4, v); }
  @$pb.TagNumber(5)
  $core.bool hasMergePath() => $_has(4);
  @$pb.TagNumber(5)
@@ -557,7 +594,7 @@ class ActorEnrichment extends $pb.GeneratedMessage {
  @$pb.TagNumber(6)
  $core.String get project => $_getSZ(5);
  @$pb.TagNumber(6)
-  set project($core.String value) => $_setString(5, value);
+  set project($core.String v) { $_setString(5, v); }
  @$pb.TagNumber(6)
  $core.bool hasProject() => $_has(5);
  @$pb.TagNumber(6)
@@ -566,7 +603,7 @@ class ActorEnrichment extends $pb.GeneratedMessage {
  @$pb.TagNumber(7)
  $core.String get parentEntityName => $_getSZ(6);
  @$pb.TagNumber(7)
-  set parentEntityName($core.String value) => $_setString(6, value);
+  set parentEntityName($core.String v) { $_setString(6, v); }
  @$pb.TagNumber(7)
  $core.bool hasParentEntityName() => $_has(6);
  @$pb.TagNumber(7)
@@ -575,22 +612,22 @@ class ActorEnrichment extends $pb.GeneratedMessage {
  @$pb.TagNumber(8)
  $core.String get parentEntityID => $_getSZ(7);
  @$pb.TagNumber(8)
-  set parentEntityID($core.String value) => $_setString(7, value);
+  set parentEntityID($core.String v) { $_setString(7, v); }
  @$pb.TagNumber(8)
  $core.bool hasParentEntityID() => $_has(7);
  @$pb.TagNumber(8)
  void clearParentEntityID() => $_clearField(8);

  @$pb.TagNumber(10)
-  $3.PartnerPayload get partner => $_getN(8);
+  $66.PartnerPayload get partner => $_getN(8);
  @$pb.TagNumber(10)
-  set partner($3.PartnerPayload value) => $_setField(10, value);
+  set partner($66.PartnerPayload v) { $_setField(10, v); }
  @$pb.TagNumber(10)
  $core.bool hasPartner() => $_has(8);
  @$pb.TagNumber(10)
  void clearPartner() => $_clearField(10);
  @$pb.TagNumber(10)
-  $3.PartnerPayload ensurePartner() => $_ensure(8);
+  $66.PartnerPayload ensurePartner() => $_ensure(8);
 }

 class ActorTriplet extends $pb.GeneratedMessage {
@@ -599,17 +636,21 @@ class ActorTriplet extends $pb.GeneratedMessage {
    Actor? previous,
    Actor? lastEvent,
  }) {
-    final result = create();
-    if (current != null) result.current = current;
-    if (previous != null) result.previous = previous;
-    if (lastEvent != null) result.lastEvent = lastEvent;
-    return result;
+    final $result = create();
+    if (current != null) {
+      $result.current = current;
+    }
+    if (previous != null) {
+      $result.previous = previous;
+    }
+    if (lastEvent != null) {
+      $result.lastEvent = lastEvent;
+    }
+    return $result;
  }
-
-  ActorTriplet._();
-
-  factory ActorTriplet.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory ActorTriplet.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  ActorTriplet._() : super();
+  factory ActorTriplet.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory ActorTriplet.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ActorTriplet', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
    ..aOM<Actor>(1, _omitFieldNames ? '' : 'Current', protoName: 'Current', subBuilder: Actor.create)
@@ -618,17 +659,21 @@ class ActorTriplet extends $pb.GeneratedMessage {
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  ActorTriplet clone() => ActorTriplet()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  ActorTriplet copyWith(void Function(ActorTriplet) updates) => super.copyWith((message) => updates(message as ActorTriplet)) as ActorTriplet;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static ActorTriplet create() => ActorTriplet._();
-  @$core.override
  ActorTriplet createEmptyInstance() => create();
  static $pb.PbList<ActorTriplet> createRepeated() => $pb.PbList<ActorTriplet>();
  @$core.pragma('dart2js:noInline')
@@ -638,7 +683,7 @@ class ActorTriplet extends $pb.GeneratedMessage {
  @$pb.TagNumber(1)
  Actor get current => $_getN(0);
  @$pb.TagNumber(1)
-  set current(Actor value) => $_setField(1, value);
+  set current(Actor v) { $_setField(1, v); }
  @$pb.TagNumber(1)
  $core.bool hasCurrent() => $_has(0);
  @$pb.TagNumber(1)
@@ -649,7 +694,7 @@ class ActorTriplet extends $pb.GeneratedMessage {
  @$pb.TagNumber(2)
  Actor get previous => $_getN(1);
  @$pb.TagNumber(2)
-  set previous(Actor value) => $_setField(2, value);
+  set previous(Actor v) { $_setField(2, v); }
  @$pb.TagNumber(2)
  $core.bool hasPrevious() => $_has(1);
  @$pb.TagNumber(2)
@@ -660,7 +705,7 @@ class ActorTriplet extends $pb.GeneratedMessage {
  @$pb.TagNumber(3)
  Actor get lastEvent => $_getN(2);
  @$pb.TagNumber(3)
-  set lastEvent(Actor value) => $_setField(3, value);
+  set lastEvent(Actor v) { $_setField(3, v); }
  @$pb.TagNumber(3)
  $core.bool hasLastEvent() => $_has(2);
  @$pb.TagNumber(3)
@@ -670,5 +715,5 @@ class ActorTriplet extends $pb.GeneratedMessage {
 }


-const $core.bool _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
-const $core.bool _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
+const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
+const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
--- a/lib/actor.pbenum.dart
+++ b/lib/actor.pbenum.dart
@@ -1,12 +1,11 @@
-// This is a generated file - do not edit.
 //
-// Generated from actor.proto.
-
+//  Generated code. Do not modify.
+//  source: actor.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

--- a/lib/actor.pbjson.dart
+++ b/lib/actor.pbjson.dart
@@ -1,14 +1,13 @@
-// This is a generated file - do not edit.
 //
-// Generated from actor.proto.
-
+//  Generated code. Do not modify.
+//  source: actor.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
@@ -61,9 +60,6 @@ const ActorPayload$json = {
    {'1': 'ClaimNumber', '3': 25, '4': 1, '5': 5, '8': {}, '10': 'ClaimNumber'},
    {'1': 'PhotoURI', '3': 26, '4': 1, '5': 9, '8': {}, '10': 'PhotoURI'},
    {'1': 'ConnectionIdentifierPrefixes', '3': 28, '4': 3, '5': 9, '8': {}, '10': 'ConnectionIdentifierPrefixes'},
-    {'1': 'IsSlotBookingEnabled', '3': 29, '4': 1, '5': 8, '8': {}, '10': 'IsSlotBookingEnabled'},
-    {'1': 'SiteAlias', '3': 30, '4': 1, '5': 11, '6': '.api.SiteAlias', '8': {}, '10': 'SiteAlias'},
-    {'1': 'AppointmentConstraints', '3': 31, '4': 1, '5': 11, '6': '.api.ActorAuthorisation', '10': 'AppointmentConstraints'},
  ],
  '7': {},
 };
@@ -89,7 +85,7 @@ final $typed_data.Uint8List actorPayloadDescriptor = $convert.base64Decode(
    'bmZsb3cSDWV4ZWN1dGlvbmZsb3cKHAoMSGFuZGxpbmd1bml0EgxoYW5kbGluZ3VuaXQKDgoFU3'
    'RvY2sSBXN0b2NrChcKBVN0b2NrEg5zdG9ja19leHRlbmRlZAoUCghUcmFja2luZxIIdHJhY2tp'
    'bme6whgrT3JkZXIsRXhlY3V0aW9uZmxvdyxTdG9jayxNb3ZlbWVudCxUcmFja2luZ1IGU3RhdH'
-    'VzEtoDCglQYXJ0bmVySUQYByABKAlCuwOSQRQyEkV4aXN0aW5nIFBhcnRuZXJJRNrBGAdQYXJ0'
+    'VzEtEDCglQYXJ0bmVySUQYByABKAlCsgOSQRQyEkV4aXN0aW5nIFBhcnRuZXJJRNrBGAdQYXJ0'
    'bmVyosIYPk1vdmVtZW50LFN0b2NrLEV4ZWN1dGlvbmZsb3csSGFuZGxpbmd1bml0LE9yZGVyLE'
    'FjdG9yLFRyYWNraW5nysIYHAoaCgEqEhVnZW5lcmF0ZWRUZXh0LGtleXdvcmTSwhiSAgoQCgVB'
    'Y3RvchIFYWN0b3IYAQogCg1FeGVjdXRpb25mbG93Eg1leGVjdXRpb25mbG93GAEKHgoMSGFuZG'
@@ -97,64 +93,60 @@ final $typed_data.Uint8List actorPayloadDescriptor = $convert.base64Decode(
    'dmVtZW50GAEKEAoFT3JkZXISBW9yZGVyGAEKFAoHUGFydG5lchIHcGFydG5lchgBChAKBVN0b2'
    'NrEgVzdG9jaxgBCkIKBVN0b2NrEg5zdG9ja19leHRlbmRlZBgBKidTaW1wbGVBZ2dyZWdhdGVG'
    'dW5jdGlvbihhbnlMYXN0LFN0cmluZykKFgoIVHJhY2tpbmcSCHRyYWNraW5nGAHawhgTChEKAS'
-    'oSDHNob3J0S2V5d29yZPrCGAVBY3RvclIJUGFydG5lcklEEjQKFUFkZGl0aW9uYWxJbmZvcm1h'
-    'dGlvbhgPIAEoCVIVQWRkaXRpb25hbEluZm9ybWF0aW9uEsABCghUeXBvbG9neRgKIAEoDjISLm'
-    'FwaS5BY3RvclR5cG9sb2d5Qo8B0sIYigEKEAoFQWN0b3ISBWFjdG9yGAEKIAoNRXhlY3V0aW9u'
-    'ZmxvdxINZXhlY3V0aW9uZmxvdxgBChAKBVN0b2NrEgVzdG9jaxgBCkIKBVN0b2NrEg5zdG9ja1'
-    '9leHRlbmRlZBgBKidTaW1wbGVBZ2dyZWdhdGVGdW5jdGlvbihhbnlMYXN0LFN0cmluZylSCFR5'
-    'cG9sb2d5EpgCCghTbmFwc2hvdBgLIAEoCzISLmFwaS5BY3RvclNuYXBzaG90QucBmsIYswEKDg'
-    'oFU3RvY2sSBXN0b2NrChcKBVN0b2NrEg5zdG9ja19leHRlbmRlZAoeCg1FeGVjdXRpb25mbG93'
-    'Eg1leGVjdXRpb25mbG93ChQKCE1vdmVtZW50Eghtb3ZlbWVudAocCgxIYW5kbGluZ3VuaXQSDG'
-    'hhbmRsaW5ndW5pdAoOCgVPcmRlchIFb3JkZXIKDgoFQWN0b3ISBWFjdG9yChQKCFRyYWNraW5n'
-    'Egh0cmFja2luZ7rCGCtPcmRlcixFeGVjdXRpb25mbG93LFN0b2NrLE1vdmVtZW50LFRyYWNraW'
-    '5nUghTbmFwc2hvdBKEAgoGRW1haWxzGAwgAygJQusBkkFRMh1NdXN0IGJlIGEgdmFsaWQgZW1h'
-    'aWwgYWRkcmVzc0owWyJKb2huLmRvZUByZWZsZXguY29tIiwgIndpbGwuc21pdGhAcmVmbGV4Lm'
-    'NvbSJd+kIMkgEJIgdyBWAB8AEBmsIYgwEKDgoFU3RvY2sSBXN0b2NrChcKBVN0b2NrEg5zdG9j'
-    'a19leHRlbmRlZAoUCghNb3ZlbWVudBIIbW92ZW1lbnQKHAoMSGFuZGxpbmd1bml0EgxoYW5kbG'
-    'luZ3VuaXQKDgoFQWN0b3ISBWFjdG9yChQKCFRyYWNraW5nEgh0cmFja2luZ1IGRW1haWxzEv0B'
-    'CgZQaG9uZXMYDSADKAlC5AGSQSlKJ1siMDcgMDAgMDAgMDAgMDAiLCAiKzQ5IDYgMDAgMDAgMD'
-    'AgMDAiXZrCGLMBCg4KBVN0b2NrEgVzdG9jawoXCgVTdG9jaxIOc3RvY2tfZXh0ZW5kZWQKHgoN'
-    'RXhlY3V0aW9uZmxvdxINZXhlY3V0aW9uZmxvdwoUCghNb3ZlbWVudBIIbW92ZW1lbnQKHAoMSG'
-    'FuZGxpbmd1bml0EgxoYW5kbGluZ3VuaXQKDgoFT3JkZXISBW9yZGVyCg4KBUFjdG9yEgVhY3Rv'
-    'cgoUCghUcmFja2luZxIIdHJhY2tpbmdSBlBob25lcxJrCgxNYW5hZ2VkU3RvY2sYDiABKAhCR5'
-    'JBEjIQQ2FuIG1hbmFnZSBzdG9ja7rCGAhUcmFja2luZ9LCGCIKIAoNRXhlY3V0aW9uZmxvdxIN'
-    'ZXhlY3V0aW9uZmxvdxgBUgxNYW5hZ2VkU3RvY2sSSwoJSXNDYXJyaWVyGBAgASgIQi2SQRgyFk'
-    'NhbiBiZSB1c2VkIGFzIGNhcnJpZXK6whgOU3RvY2ssTW92ZW1lbnRSCUlzQ2FycmllchK2AgoP'
-    'Q2FycmllclNlcnZpY2VzGBEgAygLMhMuYXBpLkNhcnJpZXJTZXJ2aWNlQvYBkkEaMhhMaXN0IG'
-    '9mIGNhcnJpZXIgc2VydmljZXPqwRgCSUSawhizAQoOCgVTdG9jaxIFc3RvY2sKFwoFU3RvY2sS'
-    'DnN0b2NrX2V4dGVuZGVkCh4KDUV4ZWN1dGlvbmZsb3cSDWV4ZWN1dGlvbmZsb3cKFAoITW92ZW'
-    '1lbnQSCG1vdmVtZW50ChwKDEhhbmRsaW5ndW5pdBIMaGFuZGxpbmd1bml0Cg4KBU9yZGVyEgVv'
-    'cmRlcgoOCgVBY3RvchIFYWN0b3IKFAoIVHJhY2tpbmcSCHRyYWNraW5nusIYF1N0b2NrLE1vdm'
-    'VtZW50LFRyYWNraW5nUg9DYXJyaWVyU2VydmljZXMSSQoRSXNTaGlwVG9Db25uZWN0ZWQYEiAB'
-    'KAhCG7rCGBdTdG9jayxNb3ZlbWVudCxUcmFja2luZ1IRSXNTaGlwVG9Db25uZWN0ZWQSTQoTSX'
-    'NTaGlwRnJvbUNvbm5lY3RlZBgTIAEoCEIbusIYF1N0b2NrLE1vdmVtZW50LFRyYWNraW5nUhNJ'
-    'c1NoaXBGcm9tQ29ubmVjdGVkEqIBChJTaGlwVG9QYXJ0bmVyQXBwSUQYFCABKAlCcpJBHTIbTX'
-    'VzdCBiZSBleGlzdGluZyBwYXJ0bmVyIElEusIYF1N0b2NrLE1vdmVtZW50LFRyYWNraW5nysIY'
-    'HAoaCgEqEhVnZW5lcmF0ZWRUZXh0LGtleXdvcmTawhgTChEKASoSDHNob3J0S2V5d29yZFISU2'
-    'hpcFRvUGFydG5lckFwcElEEqYBChRTaGlwRnJvbVBhcnRuZXJBcHBJRBgVIAEoCUJykkEdMhtN'
-    'dXN0IGJlIGV4aXN0aW5nIHBhcnRuZXIgSUS6whgXU3RvY2ssTW92ZW1lbnQsVHJhY2tpbmfKwh'
-    'gcChoKASoSFWdlbmVyYXRlZFRleHQsa2V5d29yZNrCGBMKEQoBKhIMc2hvcnRLZXl3b3JkUhRT'
-    'aGlwRnJvbVBhcnRuZXJBcHBJRBKxAQoLQXR0YWNobWVudHMYFiADKAsyFi5hcGkuQXR0YWNobW'
-    'VudFN1bW1hcnlCd5JBIDIeTnVtYmVyIG9mIGF0dGFjaG1lbnRzIHBlciB0eXBl8sEYIUF0dGFj'
-    'aG1lbnRBZGRlZCxBdHRhY2htZW50UmVtb3ZlZLrCGCtPcmRlcixFeGVjdXRpb25mbG93LFN0b2'
-    'NrLE1vdmVtZW50LFRyYWNraW5nUgtBdHRhY2htZW50cxJ7ChBBdHRhY2htZW50TnVtYmVyGBcg'
-    'ASgFQk+SQR0yG1RvdGFsIG51bWJlciBvZiBhdHRhY2htZW50c7rCGCtPcmRlcixFeGVjdXRpb2'
-    '5mbG93LFN0b2NrLE1vdmVtZW50LFRyYWNraW5nUhBBdHRhY2htZW50TnVtYmVyEpUBCgZDbGFp'
-    'bXMYGCADKAsyES5hcGkuQ2xhaW1TdW1tYXJ5QmqSQRsyGU51bWJlciBvZiBjbGFpbXMgcGVyIH'
-    'R5cGXqwRgLQ2xhaW1UeXBlSUTywRgKQ2xhaW1BZGRlZLrCGCtPcmRlcixFeGVjdXRpb25mbG93'
-    'LFN0b2NrLE1vdmVtZW50LFRyYWNraW5nUgZDbGFpbXMSXgoLQ2xhaW1OdW1iZXIYGSABKAVCPJ'
-    'JBGDIWVG90YWwgbnVtYmVyIG9mIGNsYWltc7rCGB1PcmRlcixTdG9jayxNb3ZlbWVudCxUcmFj'
-    'a2luZ1ILQ2xhaW1OdW1iZXIS6AEKCFBob3RvVVJJGBogASgJQssBkkEpSiciaHR0cHM6Ly9yZW'
-    'ZsZXgtdmlzaWJpbGl0eS1mb3JldmVyLmpwZyLSwhiKAQoQCgVBY3RvchIFYWN0b3IYAQogCg1F'
-    'eGVjdXRpb25mbG93Eg1leGVjdXRpb25mbG93GAEKEAoFU3RvY2sSBXN0b2NrGAEKQgoFU3RvY2'
-    'sSDnN0b2NrX2V4dGVuZGVkGAEqJ1NpbXBsZUFnZ3JlZ2F0ZUZ1bmN0aW9uKGFueUxhc3QsU3Ry'
-    'aW5nKdrCGAwKCgoBKhIFaW1hZ2VSCFBob3RvVVJJEl8KHENvbm5lY3Rpb25JZGVudGlmaWVyUH'
-    'JlZml4ZXMYHCADKAlCG7rCGBdTdG9jayxNb3ZlbWVudCxUcmFja2luZ1IcQ29ubmVjdGlvbklk'
-    'ZW50aWZpZXJQcmVmaXhlcxJPChRJc1Nsb3RCb29raW5nRW5hYmxlZBgdIAEoCEIbusIYF1N0b2'
-    'NrLE1vdmVtZW50LFRyYWNraW5nUhRJc1Nsb3RCb29raW5nRW5hYmxlZBJJCglTaXRlQWxpYXMY'
-    'HiABKAsyDi5hcGkuU2l0ZUFsaWFzQhu6whgXU3RvY2ssTW92ZW1lbnQsVHJhY2tpbmdSCVNpdG'
-    'VBbGlhcxJPChZBcHBvaW50bWVudENvbnN0cmFpbnRzGB8gASgLMhcuYXBpLkFjdG9yQXV0aG9y'
-    'aXNhdGlvblIWQXBwb2ludG1lbnRDb25zdHJhaW50czoMkkEJCgfSAQROYW1l');
+    'oSDHNob3J0S2V5d29yZFIJUGFydG5lcklEEjQKFUFkZGl0aW9uYWxJbmZvcm1hdGlvbhgPIAEo'
+    'CVIVQWRkaXRpb25hbEluZm9ybWF0aW9uEsABCghUeXBvbG9neRgKIAEoDjISLmFwaS5BY3Rvcl'
+    'R5cG9sb2d5Qo8B0sIYigEKEAoFQWN0b3ISBWFjdG9yGAEKIAoNRXhlY3V0aW9uZmxvdxINZXhl'
+    'Y3V0aW9uZmxvdxgBChAKBVN0b2NrEgVzdG9jaxgBCkIKBVN0b2NrEg5zdG9ja19leHRlbmRlZB'
+    'gBKidTaW1wbGVBZ2dyZWdhdGVGdW5jdGlvbihhbnlMYXN0LFN0cmluZylSCFR5cG9sb2d5EpgC'
+    'CghTbmFwc2hvdBgLIAEoCzISLmFwaS5BY3RvclNuYXBzaG90QucBmsIYswEKDgoFU3RvY2sSBX'
+    'N0b2NrChcKBVN0b2NrEg5zdG9ja19leHRlbmRlZAoeCg1FeGVjdXRpb25mbG93Eg1leGVjdXRp'
+    'b25mbG93ChQKCE1vdmVtZW50Eghtb3ZlbWVudAocCgxIYW5kbGluZ3VuaXQSDGhhbmRsaW5ndW'
+    '5pdAoOCgVPcmRlchIFb3JkZXIKDgoFQWN0b3ISBWFjdG9yChQKCFRyYWNraW5nEgh0cmFja2lu'
+    'Z7rCGCtPcmRlcixFeGVjdXRpb25mbG93LFN0b2NrLE1vdmVtZW50LFRyYWNraW5nUghTbmFwc2'
+    'hvdBKEAgoGRW1haWxzGAwgAygJQusBkkFRMh1NdXN0IGJlIGEgdmFsaWQgZW1haWwgYWRkcmVz'
+    'c0owWyJKb2huLmRvZUByZWZsZXguY29tIiwgIndpbGwuc21pdGhAcmVmbGV4LmNvbSJd+kIMkg'
+    'EJIgdyBWAB8AEBmsIYgwEKDgoFU3RvY2sSBXN0b2NrChcKBVN0b2NrEg5zdG9ja19leHRlbmRl'
+    'ZAoUCghNb3ZlbWVudBIIbW92ZW1lbnQKHAoMSGFuZGxpbmd1bml0EgxoYW5kbGluZ3VuaXQKDg'
+    'oFQWN0b3ISBWFjdG9yChQKCFRyYWNraW5nEgh0cmFja2luZ1IGRW1haWxzEv0BCgZQaG9uZXMY'
+    'DSADKAlC5AGSQSlKJ1siMDcgMDAgMDAgMDAgMDAiLCAiKzQ5IDYgMDAgMDAgMDAgMDAiXZrCGL'
+    'MBCg4KBVN0b2NrEgVzdG9jawoXCgVTdG9jaxIOc3RvY2tfZXh0ZW5kZWQKHgoNRXhlY3V0aW9u'
+    'ZmxvdxINZXhlY3V0aW9uZmxvdwoUCghNb3ZlbWVudBIIbW92ZW1lbnQKHAoMSGFuZGxpbmd1bm'
+    'l0EgxoYW5kbGluZ3VuaXQKDgoFT3JkZXISBW9yZGVyCg4KBUFjdG9yEgVhY3RvcgoUCghUcmFj'
+    'a2luZxIIdHJhY2tpbmdSBlBob25lcxJrCgxNYW5hZ2VkU3RvY2sYDiABKAhCR5JBEjIQQ2FuIG'
+    '1hbmFnZSBzdG9ja7rCGAhUcmFja2luZ9LCGCIKIAoNRXhlY3V0aW9uZmxvdxINZXhlY3V0aW9u'
+    'ZmxvdxgBUgxNYW5hZ2VkU3RvY2sSSwoJSXNDYXJyaWVyGBAgASgIQi2SQRgyFkNhbiBiZSB1c2'
+    'VkIGFzIGNhcnJpZXK6whgOU3RvY2ssTW92ZW1lbnRSCUlzQ2FycmllchK2AgoPQ2FycmllclNl'
+    'cnZpY2VzGBEgAygLMhMuYXBpLkNhcnJpZXJTZXJ2aWNlQvYBkkEaMhhMaXN0IG9mIGNhcnJpZX'
+    'Igc2VydmljZXPqwRgCSUSawhizAQoOCgVTdG9jaxIFc3RvY2sKFwoFU3RvY2sSDnN0b2NrX2V4'
+    'dGVuZGVkCh4KDUV4ZWN1dGlvbmZsb3cSDWV4ZWN1dGlvbmZsb3cKFAoITW92ZW1lbnQSCG1vdm'
+    'VtZW50ChwKDEhhbmRsaW5ndW5pdBIMaGFuZGxpbmd1bml0Cg4KBU9yZGVyEgVvcmRlcgoOCgVB'
+    'Y3RvchIFYWN0b3IKFAoIVHJhY2tpbmcSCHRyYWNraW5nusIYF1N0b2NrLE1vdmVtZW50LFRyYW'
+    'NraW5nUg9DYXJyaWVyU2VydmljZXMSSQoRSXNTaGlwVG9Db25uZWN0ZWQYEiABKAhCG7rCGBdT'
+    'dG9jayxNb3ZlbWVudCxUcmFja2luZ1IRSXNTaGlwVG9Db25uZWN0ZWQSTQoTSXNTaGlwRnJvbU'
+    'Nvbm5lY3RlZBgTIAEoCEIbusIYF1N0b2NrLE1vdmVtZW50LFRyYWNraW5nUhNJc1NoaXBGcm9t'
+    'Q29ubmVjdGVkEqIBChJTaGlwVG9QYXJ0bmVyQXBwSUQYFCABKAlCcpJBHTIbTXVzdCBiZSBleG'
+    'lzdGluZyBwYXJ0bmVyIElEusIYF1N0b2NrLE1vdmVtZW50LFRyYWNraW5nysIYHAoaCgEqEhVn'
+    'ZW5lcmF0ZWRUZXh0LGtleXdvcmTawhgTChEKASoSDHNob3J0S2V5d29yZFISU2hpcFRvUGFydG'
+    '5lckFwcElEEqYBChRTaGlwRnJvbVBhcnRuZXJBcHBJRBgVIAEoCUJykkEdMhtNdXN0IGJlIGV4'
+    'aXN0aW5nIHBhcnRuZXIgSUS6whgXU3RvY2ssTW92ZW1lbnQsVHJhY2tpbmfKwhgcChoKASoSFW'
+    'dlbmVyYXRlZFRleHQsa2V5d29yZNrCGBMKEQoBKhIMc2hvcnRLZXl3b3JkUhRTaGlwRnJvbVBh'
+    'cnRuZXJBcHBJRBKxAQoLQXR0YWNobWVudHMYFiADKAsyFi5hcGkuQXR0YWNobWVudFN1bW1hcn'
+    'lCd5JBIDIeTnVtYmVyIG9mIGF0dGFjaG1lbnRzIHBlciB0eXBl8sEYIUF0dGFjaG1lbnRBZGRl'
+    'ZCxBdHRhY2htZW50UmVtb3ZlZLrCGCtPcmRlcixFeGVjdXRpb25mbG93LFN0b2NrLE1vdmVtZW'
+    '50LFRyYWNraW5nUgtBdHRhY2htZW50cxJ7ChBBdHRhY2htZW50TnVtYmVyGBcgASgFQk+SQR0y'
+    'G1RvdGFsIG51bWJlciBvZiBhdHRhY2htZW50c7rCGCtPcmRlcixFeGVjdXRpb25mbG93LFN0b2'
+    'NrLE1vdmVtZW50LFRyYWNraW5nUhBBdHRhY2htZW50TnVtYmVyEpUBCgZDbGFpbXMYGCADKAsy'
+    'ES5hcGkuQ2xhaW1TdW1tYXJ5QmqSQRsyGU51bWJlciBvZiBjbGFpbXMgcGVyIHR5cGXqwRgLQ2'
+    'xhaW1UeXBlSUTywRgKQ2xhaW1BZGRlZLrCGCtPcmRlcixFeGVjdXRpb25mbG93LFN0b2NrLE1v'
+    'dmVtZW50LFRyYWNraW5nUgZDbGFpbXMSXgoLQ2xhaW1OdW1iZXIYGSABKAVCPJJBGDIWVG90YW'
+    'wgbnVtYmVyIG9mIGNsYWltc7rCGB1PcmRlcixTdG9jayxNb3ZlbWVudCxUcmFja2luZ1ILQ2xh'
+    'aW1OdW1iZXIS6AEKCFBob3RvVVJJGBogASgJQssBkkEpSiciaHR0cHM6Ly9yZWZsZXgtdmlzaW'
+    'JpbGl0eS1mb3JldmVyLmpwZyLSwhiKAQoQCgVBY3RvchIFYWN0b3IYAQogCg1FeGVjdXRpb25m'
+    'bG93Eg1leGVjdXRpb25mbG93GAEKEAoFU3RvY2sSBXN0b2NrGAEKQgoFU3RvY2sSDnN0b2NrX2'
+    'V4dGVuZGVkGAEqJ1NpbXBsZUFnZ3JlZ2F0ZUZ1bmN0aW9uKGFueUxhc3QsU3RyaW5nKdrCGAwK'
+    'CgoBKhIFaW1hZ2VSCFBob3RvVVJJEl8KHENvbm5lY3Rpb25JZGVudGlmaWVyUHJlZml4ZXMYHC'
+    'ADKAlCG7rCGBdTdG9jayxNb3ZlbWVudCxUcmFja2luZ1IcQ29ubmVjdGlvbklkZW50aWZpZXJQ'
+    'cmVmaXhlczoMkkEJCgfSAQROYW1l');

@$core.Deprecated('Use actorEnrichmentDescriptor instead')
 const ActorEnrichment$json = {
--- a/lib/actorAction.pb.dart
+++ b/lib/actorAction.pb.dart
@@ -1,21 +1,20 @@
-// This is a generated file - do not edit.
 //
-// Generated from actorAction.proto.
-
+//  Generated code. Do not modify.
+//  source: actorAction.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:core' as $core;

 import 'package:protobuf/protobuf.dart' as $pb;

-import 'repositoryShared.pb.dart' as $0;
-import 'shared.pb.dart' as $1;
+import 'repositoryShared.pb.dart' as $65;
+import 'shared.pb.dart' as $3;

 export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;

@@ -25,34 +24,38 @@ export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
 /// by reseting the quantity of missing stock entry for the current snapshot
 class ActorCompleteSnapshotPayload extends $pb.GeneratedMessage {
  factory ActorCompleteSnapshotPayload({
-    $0.ActorSnapshot? snapshot,
+    $65.ActorSnapshot? snapshot,
  }) {
-    final result = create();
-    if (snapshot != null) result.snapshot = snapshot;
-    return result;
+    final $result = create();
+    if (snapshot != null) {
+      $result.snapshot = snapshot;
+    }
+    return $result;
  }
-
-  ActorCompleteSnapshotPayload._();
-
-  factory ActorCompleteSnapshotPayload.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory ActorCompleteSnapshotPayload.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  ActorCompleteSnapshotPayload._() : super();
+  factory ActorCompleteSnapshotPayload.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory ActorCompleteSnapshotPayload.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ActorCompleteSnapshotPayload', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$0.ActorSnapshot>(1, _omitFieldNames ? '' : 'Snapshot', protoName: 'Snapshot', subBuilder: $0.ActorSnapshot.create)
+    ..aOM<$65.ActorSnapshot>(1, _omitFieldNames ? '' : 'Snapshot', protoName: 'Snapshot', subBuilder: $65.ActorSnapshot.create)
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  ActorCompleteSnapshotPayload clone() => ActorCompleteSnapshotPayload()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  ActorCompleteSnapshotPayload copyWith(void Function(ActorCompleteSnapshotPayload) updates) => super.copyWith((message) => updates(message as ActorCompleteSnapshotPayload)) as ActorCompleteSnapshotPayload;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static ActorCompleteSnapshotPayload create() => ActorCompleteSnapshotPayload._();
-  @$core.override
  ActorCompleteSnapshotPayload createEmptyInstance() => create();
  static $pb.PbList<ActorCompleteSnapshotPayload> createRepeated() => $pb.PbList<ActorCompleteSnapshotPayload>();
  @$core.pragma('dart2js:noInline')
@@ -60,59 +63,71 @@ class ActorCompleteSnapshotPayload extends $pb.GeneratedMessage {
  static ActorCompleteSnapshotPayload? _defaultInstance;

  @$pb.TagNumber(1)
-  $0.ActorSnapshot get snapshot => $_getN(0);
+  $65.ActorSnapshot get snapshot => $_getN(0);
  @$pb.TagNumber(1)
-  set snapshot($0.ActorSnapshot value) => $_setField(1, value);
+  set snapshot($65.ActorSnapshot v) { $_setField(1, v); }
  @$pb.TagNumber(1)
  $core.bool hasSnapshot() => $_has(0);
  @$pb.TagNumber(1)
  void clearSnapshot() => $_clearField(1);
  @$pb.TagNumber(1)
-  $0.ActorSnapshot ensureSnapshot() => $_ensure(0);
+  $65.ActorSnapshot ensureSnapshot() => $_ensure(0);
 }

 class ActorCompleteSnapshot extends $pb.GeneratedMessage {
  factory ActorCompleteSnapshot({
-    $1.CommandHeader? header,
-    $1.EntityID? iD,
+    $3.CommandHeader? header,
+    $3.EntityID? iD,
    ActorCompleteSnapshotPayload? payload,
    ActorCompleteSnapshotPayload? eventPayload,
    ActorCompleteSnapshotPayload? previousPayload,
  }) {
-    final result = create();
-    if (header != null) result.header = header;
-    if (iD != null) result.iD = iD;
-    if (payload != null) result.payload = payload;
-    if (eventPayload != null) result.eventPayload = eventPayload;
-    if (previousPayload != null) result.previousPayload = previousPayload;
-    return result;
+    final $result = create();
+    if (header != null) {
+      $result.header = header;
+    }
+    if (iD != null) {
+      $result.iD = iD;
+    }
+    if (payload != null) {
+      $result.payload = payload;
+    }
+    if (eventPayload != null) {
+      $result.eventPayload = eventPayload;
+    }
+    if (previousPayload != null) {
+      $result.previousPayload = previousPayload;
+    }
+    return $result;
  }
-
-  ActorCompleteSnapshot._();
-
-  factory ActorCompleteSnapshot.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory ActorCompleteSnapshot.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  ActorCompleteSnapshot._() : super();
+  factory ActorCompleteSnapshot.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory ActorCompleteSnapshot.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ActorCompleteSnapshot', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$1.CommandHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.CommandHeader.create)
-    ..aOM<$1.EntityID>(2, _omitFieldNames ? '' : 'ID', protoName: 'ID', subBuilder: $1.EntityID.create)
+    ..aOM<$3.CommandHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.CommandHeader.create)
+    ..aOM<$3.EntityID>(2, _omitFieldNames ? '' : 'ID', protoName: 'ID', subBuilder: $3.EntityID.create)
    ..aOM<ActorCompleteSnapshotPayload>(3, _omitFieldNames ? '' : 'Payload', protoName: 'Payload', subBuilder: ActorCompleteSnapshotPayload.create)
    ..aOM<ActorCompleteSnapshotPayload>(4, _omitFieldNames ? '' : 'EventPayload', protoName: 'EventPayload', subBuilder: ActorCompleteSnapshotPayload.create)
    ..aOM<ActorCompleteSnapshotPayload>(5, _omitFieldNames ? '' : 'PreviousPayload', protoName: 'PreviousPayload', subBuilder: ActorCompleteSnapshotPayload.create)
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  ActorCompleteSnapshot clone() => ActorCompleteSnapshot()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  ActorCompleteSnapshot copyWith(void Function(ActorCompleteSnapshot) updates) => super.copyWith((message) => updates(message as ActorCompleteSnapshot)) as ActorCompleteSnapshot;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static ActorCompleteSnapshot create() => ActorCompleteSnapshot._();
-  @$core.override
  ActorCompleteSnapshot createEmptyInstance() => create();
  static $pb.PbList<ActorCompleteSnapshot> createRepeated() => $pb.PbList<ActorCompleteSnapshot>();
  @$core.pragma('dart2js:noInline')
@@ -120,31 +135,31 @@ class ActorCompleteSnapshot extends $pb.GeneratedMessage {
  static ActorCompleteSnapshot? _defaultInstance;

  @$pb.TagNumber(1)
-  $1.CommandHeader get header => $_getN(0);
+  $3.CommandHeader get header => $_getN(0);
  @$pb.TagNumber(1)
-  set header($1.CommandHeader value) => $_setField(1, value);
+  set header($3.CommandHeader v) { $_setField(1, v); }
  @$pb.TagNumber(1)
  $core.bool hasHeader() => $_has(0);
  @$pb.TagNumber(1)
  void clearHeader() => $_clearField(1);
  @$pb.TagNumber(1)
-  $1.CommandHeader ensureHeader() => $_ensure(0);
+  $3.CommandHeader ensureHeader() => $_ensure(0);

  @$pb.TagNumber(2)
-  $1.EntityID get iD => $_getN(1);
+  $3.EntityID get iD => $_getN(1);
  @$pb.TagNumber(2)
-  set iD($1.EntityID value) => $_setField(2, value);
+  set iD($3.EntityID v) { $_setField(2, v); }
  @$pb.TagNumber(2)
  $core.bool hasID() => $_has(1);
  @$pb.TagNumber(2)
  void clearID() => $_clearField(2);
  @$pb.TagNumber(2)
-  $1.EntityID ensureID() => $_ensure(1);
+  $3.EntityID ensureID() => $_ensure(1);

  @$pb.TagNumber(3)
  ActorCompleteSnapshotPayload get payload => $_getN(2);
  @$pb.TagNumber(3)
-  set payload(ActorCompleteSnapshotPayload value) => $_setField(3, value);
+  set payload(ActorCompleteSnapshotPayload v) { $_setField(3, v); }
  @$pb.TagNumber(3)
  $core.bool hasPayload() => $_has(2);
  @$pb.TagNumber(3)
@@ -155,7 +170,7 @@ class ActorCompleteSnapshot extends $pb.GeneratedMessage {
  @$pb.TagNumber(4)
  ActorCompleteSnapshotPayload get eventPayload => $_getN(3);
  @$pb.TagNumber(4)
-  set eventPayload(ActorCompleteSnapshotPayload value) => $_setField(4, value);
+  set eventPayload(ActorCompleteSnapshotPayload v) { $_setField(4, v); }
  @$pb.TagNumber(4)
  $core.bool hasEventPayload() => $_has(3);
  @$pb.TagNumber(4)
@@ -166,7 +181,7 @@ class ActorCompleteSnapshot extends $pb.GeneratedMessage {
  @$pb.TagNumber(5)
  ActorCompleteSnapshotPayload get previousPayload => $_getN(4);
  @$pb.TagNumber(5)
-  set previousPayload(ActorCompleteSnapshotPayload value) => $_setField(5, value);
+  set previousPayload(ActorCompleteSnapshotPayload v) { $_setField(5, v); }
  @$pb.TagNumber(5)
  $core.bool hasPreviousPayload() => $_has(4);
  @$pb.TagNumber(5)
@@ -176,5 +191,5 @@ class ActorCompleteSnapshot extends $pb.GeneratedMessage {
 }


-const $core.bool _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
-const $core.bool _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
+const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
+const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
--- a/lib/actorAction.pbenum.dart
+++ b/lib/actorAction.pbenum.dart
@@ -1,12 +1,11 @@
-// This is a generated file - do not edit.
 //
-// Generated from actorAction.proto.
-
+//  Generated code. Do not modify.
+//  source: actorAction.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

--- a/lib/actorAction.pbjson.dart
+++ b/lib/actorAction.pbjson.dart
@@ -1,14 +1,13 @@
-// This is a generated file - do not edit.
 //
-// Generated from actorAction.proto.
-
+//  Generated code. Do not modify.
+//  source: actorAction.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
--- a/lib/actorInput.pb.dart
+++ b/lib/actorInput.pb.dart
--- a/lib/actorInput.pbenum.dart
+++ b/lib/actorInput.pbenum.dart
@@ -1,12 +1,11 @@
-// This is a generated file - do not edit.
 //
-// Generated from actorInput.proto.
-
+//  Generated code. Do not modify.
+//  source: actorInput.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

--- a/lib/actorInput.pbgrpc.dart
+++ b/lib/actorInput.pbgrpc.dart
@@ -1,14 +1,13 @@
-// This is a generated file - do not edit.
 //
-// Generated from actorInput.proto.
-
+//  Generated code. Do not modify.
+//  source: actorInput.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:async' as $async;
 import 'dart:core' as $core;
@@ -16,90 +15,78 @@ import 'dart:core' as $core;
 import 'package:grpc/service_api.dart' as $grpc;
 import 'package:protobuf/protobuf.dart' as $pb;

-import 'actorInput.pb.dart' as $0;
+import 'actorInput.pb.dart' as $1;

 export 'actorInput.pb.dart';

-///
-/// API-server services
@$pb.GrpcServiceName('api.ActorInputAPI')
 class ActorInputAPIClient extends $grpc.Client {
-  /// The hostname for this service.
-  static const $core.String defaultHost = '';
-
-  /// OAuth scopes needed for the client.
-  static const $core.List<$core.String> oauthScopes = [
-    '',
-  ];
+  static final _$created = $grpc.ClientMethod<$1.ActorCreatedRequest, $1.ActorCreatedResponse>(
+      '/api.ActorInputAPI/Created',
+      ($1.ActorCreatedRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $1.ActorCreatedResponse.fromBuffer(value));
+  static final _$createdv2 = $grpc.ClientMethod<$1.ActorCreatedv2Request, $1.ActorCreatedv2Response>(
+      '/api.ActorInputAPI/Createdv2',
+      ($1.ActorCreatedv2Request value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $1.ActorCreatedv2Response.fromBuffer(value));
+  static final _$deleted = $grpc.ClientMethod<$1.ActorDeletedRequest, $1.ActorDeletedResponse>(
+      '/api.ActorInputAPI/Deleted',
+      ($1.ActorDeletedRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $1.ActorDeletedResponse.fromBuffer(value));
+  static final _$snapshotCompleted = $grpc.ClientMethod<$1.ActorSnapshotCompletedRequest, $1.ActorSnapshotCompletedResponse>(
+      '/api.ActorInputAPI/SnapshotCompleted',
+      ($1.ActorSnapshotCompletedRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $1.ActorSnapshotCompletedResponse.fromBuffer(value));
+  static final _$attachmentAdded = $grpc.ClientMethod<$1.ActorAttachmentAddedRequest, $1.ActorAttachmentAddedResponse>(
+      '/api.ActorInputAPI/AttachmentAdded',
+      ($1.ActorAttachmentAddedRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $1.ActorAttachmentAddedResponse.fromBuffer(value));
+  static final _$attachmentRemoved = $grpc.ClientMethod<$1.ActorAttachmentRemovedRequest, $1.ActorAttachmentRemovedResponse>(
+      '/api.ActorInputAPI/AttachmentRemoved',
+      ($1.ActorAttachmentRemovedRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $1.ActorAttachmentRemovedResponse.fromBuffer(value));
+  static final _$claimAdded = $grpc.ClientMethod<$1.ActorClaimAddedRequest, $1.ActorClaimAddedResponse>(
+      '/api.ActorInputAPI/ClaimAdded',
+      ($1.ActorClaimAddedRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $1.ActorClaimAddedResponse.fromBuffer(value));
+  static final _$metaDataUpdated = $grpc.ClientMethod<$1.ActorMetaDataUpdatedRequest, $1.ActorMetaDataUpdatedResponse>(
+      '/api.ActorInputAPI/MetaDataUpdated',
+      ($1.ActorMetaDataUpdatedRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $1.ActorMetaDataUpdatedResponse.fromBuffer(value));

  ActorInputAPIClient(super.channel, {super.options, super.interceptors});

-  $grpc.ResponseFuture<$0.ActorCreatedResponse> created($0.ActorCreatedRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$1.ActorCreatedResponse> created($1.ActorCreatedRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$created, request, options: options);
  }

-  $grpc.ResponseFuture<$0.ActorCreatedv2Response> createdv2($0.ActorCreatedv2Request request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$1.ActorCreatedv2Response> createdv2($1.ActorCreatedv2Request request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$createdv2, request, options: options);
  }

-  $grpc.ResponseFuture<$0.ActorDeletedResponse> deleted($0.ActorDeletedRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$1.ActorDeletedResponse> deleted($1.ActorDeletedRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$deleted, request, options: options);
  }

-  $grpc.ResponseFuture<$0.ActorSnapshotCompletedResponse> snapshotCompleted($0.ActorSnapshotCompletedRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$1.ActorSnapshotCompletedResponse> snapshotCompleted($1.ActorSnapshotCompletedRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$snapshotCompleted, request, options: options);
  }

-  $grpc.ResponseFuture<$0.ActorAttachmentAddedResponse> attachmentAdded($0.ActorAttachmentAddedRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$1.ActorAttachmentAddedResponse> attachmentAdded($1.ActorAttachmentAddedRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$attachmentAdded, request, options: options);
  }

-  $grpc.ResponseFuture<$0.ActorAttachmentRemovedResponse> attachmentRemoved($0.ActorAttachmentRemovedRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$1.ActorAttachmentRemovedResponse> attachmentRemoved($1.ActorAttachmentRemovedRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$attachmentRemoved, request, options: options);
  }

-  $grpc.ResponseFuture<$0.ActorClaimAddedResponse> claimAdded($0.ActorClaimAddedRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$1.ActorClaimAddedResponse> claimAdded($1.ActorClaimAddedRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$claimAdded, request, options: options);
  }

-  $grpc.ResponseFuture<$0.ActorMetaDataUpdatedResponse> metaDataUpdated($0.ActorMetaDataUpdatedRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$1.ActorMetaDataUpdatedResponse> metaDataUpdated($1.ActorMetaDataUpdatedRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$metaDataUpdated, request, options: options);
  }
-
-    // method descriptors
-
-  static final _$created = $grpc.ClientMethod<$0.ActorCreatedRequest, $0.ActorCreatedResponse>(
-      '/api.ActorInputAPI/Created',
-      ($0.ActorCreatedRequest value) => value.writeToBuffer(),
-      $0.ActorCreatedResponse.fromBuffer);
-  static final _$createdv2 = $grpc.ClientMethod<$0.ActorCreatedv2Request, $0.ActorCreatedv2Response>(
-      '/api.ActorInputAPI/Createdv2',
-      ($0.ActorCreatedv2Request value) => value.writeToBuffer(),
-      $0.ActorCreatedv2Response.fromBuffer);
-  static final _$deleted = $grpc.ClientMethod<$0.ActorDeletedRequest, $0.ActorDeletedResponse>(
-      '/api.ActorInputAPI/Deleted',
-      ($0.ActorDeletedRequest value) => value.writeToBuffer(),
-      $0.ActorDeletedResponse.fromBuffer);
-  static final _$snapshotCompleted = $grpc.ClientMethod<$0.ActorSnapshotCompletedRequest, $0.ActorSnapshotCompletedResponse>(
-      '/api.ActorInputAPI/SnapshotCompleted',
-      ($0.ActorSnapshotCompletedRequest value) => value.writeToBuffer(),
-      $0.ActorSnapshotCompletedResponse.fromBuffer);
-  static final _$attachmentAdded = $grpc.ClientMethod<$0.ActorAttachmentAddedRequest, $0.ActorAttachmentAddedResponse>(
-      '/api.ActorInputAPI/AttachmentAdded',
-      ($0.ActorAttachmentAddedRequest value) => value.writeToBuffer(),
-      $0.ActorAttachmentAddedResponse.fromBuffer);
-  static final _$attachmentRemoved = $grpc.ClientMethod<$0.ActorAttachmentRemovedRequest, $0.ActorAttachmentRemovedResponse>(
-      '/api.ActorInputAPI/AttachmentRemoved',
-      ($0.ActorAttachmentRemovedRequest value) => value.writeToBuffer(),
-      $0.ActorAttachmentRemovedResponse.fromBuffer);
-  static final _$claimAdded = $grpc.ClientMethod<$0.ActorClaimAddedRequest, $0.ActorClaimAddedResponse>(
-      '/api.ActorInputAPI/ClaimAdded',
-      ($0.ActorClaimAddedRequest value) => value.writeToBuffer(),
-      $0.ActorClaimAddedResponse.fromBuffer);
-  static final _$metaDataUpdated = $grpc.ClientMethod<$0.ActorMetaDataUpdatedRequest, $0.ActorMetaDataUpdatedResponse>(
-      '/api.ActorInputAPI/MetaDataUpdated',
-      ($0.ActorMetaDataUpdatedRequest value) => value.writeToBuffer(),
-      $0.ActorMetaDataUpdatedResponse.fromBuffer);
 }

@$pb.GrpcServiceName('api.ActorInputAPI')
@@ -107,110 +94,102 @@ abstract class ActorInputAPIServiceBase extends $grpc.Service {
  $core.String get $name => 'api.ActorInputAPI';

  ActorInputAPIServiceBase() {
-    $addMethod($grpc.ServiceMethod<$0.ActorCreatedRequest, $0.ActorCreatedResponse>(
+    $addMethod($grpc.ServiceMethod<$1.ActorCreatedRequest, $1.ActorCreatedResponse>(
        'Created',
        created_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.ActorCreatedRequest.fromBuffer(value),
-        ($0.ActorCreatedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.ActorCreatedv2Request, $0.ActorCreatedv2Response>(
+        ($core.List<$core.int> value) => $1.ActorCreatedRequest.fromBuffer(value),
+        ($1.ActorCreatedResponse value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$1.ActorCreatedv2Request, $1.ActorCreatedv2Response>(
        'Createdv2',
        createdv2_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.ActorCreatedv2Request.fromBuffer(value),
-        ($0.ActorCreatedv2Response value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.ActorDeletedRequest, $0.ActorDeletedResponse>(
+        ($core.List<$core.int> value) => $1.ActorCreatedv2Request.fromBuffer(value),
+        ($1.ActorCreatedv2Response value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$1.ActorDeletedRequest, $1.ActorDeletedResponse>(
        'Deleted',
        deleted_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.ActorDeletedRequest.fromBuffer(value),
-        ($0.ActorDeletedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.ActorSnapshotCompletedRequest, $0.ActorSnapshotCompletedResponse>(
+        ($core.List<$core.int> value) => $1.ActorDeletedRequest.fromBuffer(value),
+        ($1.ActorDeletedResponse value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$1.ActorSnapshotCompletedRequest, $1.ActorSnapshotCompletedResponse>(
        'SnapshotCompleted',
        snapshotCompleted_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.ActorSnapshotCompletedRequest.fromBuffer(value),
-        ($0.ActorSnapshotCompletedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.ActorAttachmentAddedRequest, $0.ActorAttachmentAddedResponse>(
+        ($core.List<$core.int> value) => $1.ActorSnapshotCompletedRequest.fromBuffer(value),
+        ($1.ActorSnapshotCompletedResponse value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$1.ActorAttachmentAddedRequest, $1.ActorAttachmentAddedResponse>(
        'AttachmentAdded',
        attachmentAdded_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.ActorAttachmentAddedRequest.fromBuffer(value),
-        ($0.ActorAttachmentAddedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.ActorAttachmentRemovedRequest, $0.ActorAttachmentRemovedResponse>(
+        ($core.List<$core.int> value) => $1.ActorAttachmentAddedRequest.fromBuffer(value),
+        ($1.ActorAttachmentAddedResponse value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$1.ActorAttachmentRemovedRequest, $1.ActorAttachmentRemovedResponse>(
        'AttachmentRemoved',
        attachmentRemoved_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.ActorAttachmentRemovedRequest.fromBuffer(value),
-        ($0.ActorAttachmentRemovedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.ActorClaimAddedRequest, $0.ActorClaimAddedResponse>(
+        ($core.List<$core.int> value) => $1.ActorAttachmentRemovedRequest.fromBuffer(value),
+        ($1.ActorAttachmentRemovedResponse value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$1.ActorClaimAddedRequest, $1.ActorClaimAddedResponse>(
        'ClaimAdded',
        claimAdded_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.ActorClaimAddedRequest.fromBuffer(value),
-        ($0.ActorClaimAddedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.ActorMetaDataUpdatedRequest, $0.ActorMetaDataUpdatedResponse>(
+        ($core.List<$core.int> value) => $1.ActorClaimAddedRequest.fromBuffer(value),
+        ($1.ActorClaimAddedResponse value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$1.ActorMetaDataUpdatedRequest, $1.ActorMetaDataUpdatedResponse>(
        'MetaDataUpdated',
        metaDataUpdated_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.ActorMetaDataUpdatedRequest.fromBuffer(value),
-        ($0.ActorMetaDataUpdatedResponse value) => value.writeToBuffer()));
+        ($core.List<$core.int> value) => $1.ActorMetaDataUpdatedRequest.fromBuffer(value),
+        ($1.ActorMetaDataUpdatedResponse value) => value.writeToBuffer()));
  }

-  $async.Future<$0.ActorCreatedResponse> created_Pre($grpc.ServiceCall $call, $async.Future<$0.ActorCreatedRequest> $request) async {
+  $async.Future<$1.ActorCreatedResponse> created_Pre($grpc.ServiceCall $call, $async.Future<$1.ActorCreatedRequest> $request) async {
    return created($call, await $request);
  }

-  $async.Future<$0.ActorCreatedResponse> created($grpc.ServiceCall call, $0.ActorCreatedRequest request);
-
-  $async.Future<$0.ActorCreatedv2Response> createdv2_Pre($grpc.ServiceCall $call, $async.Future<$0.ActorCreatedv2Request> $request) async {
+  $async.Future<$1.ActorCreatedv2Response> createdv2_Pre($grpc.ServiceCall $call, $async.Future<$1.ActorCreatedv2Request> $request) async {
    return createdv2($call, await $request);
  }

-  $async.Future<$0.ActorCreatedv2Response> createdv2($grpc.ServiceCall call, $0.ActorCreatedv2Request request);
-
-  $async.Future<$0.ActorDeletedResponse> deleted_Pre($grpc.ServiceCall $call, $async.Future<$0.ActorDeletedRequest> $request) async {
+  $async.Future<$1.ActorDeletedResponse> deleted_Pre($grpc.ServiceCall $call, $async.Future<$1.ActorDeletedRequest> $request) async {
    return deleted($call, await $request);
  }

-  $async.Future<$0.ActorDeletedResponse> deleted($grpc.ServiceCall call, $0.ActorDeletedRequest request);
-
-  $async.Future<$0.ActorSnapshotCompletedResponse> snapshotCompleted_Pre($grpc.ServiceCall $call, $async.Future<$0.ActorSnapshotCompletedRequest> $request) async {
+  $async.Future<$1.ActorSnapshotCompletedResponse> snapshotCompleted_Pre($grpc.ServiceCall $call, $async.Future<$1.ActorSnapshotCompletedRequest> $request) async {
    return snapshotCompleted($call, await $request);
  }

-  $async.Future<$0.ActorSnapshotCompletedResponse> snapshotCompleted($grpc.ServiceCall call, $0.ActorSnapshotCompletedRequest request);
-
-  $async.Future<$0.ActorAttachmentAddedResponse> attachmentAdded_Pre($grpc.ServiceCall $call, $async.Future<$0.ActorAttachmentAddedRequest> $request) async {
+  $async.Future<$1.ActorAttachmentAddedResponse> attachmentAdded_Pre($grpc.ServiceCall $call, $async.Future<$1.ActorAttachmentAddedRequest> $request) async {
    return attachmentAdded($call, await $request);
  }

-  $async.Future<$0.ActorAttachmentAddedResponse> attachmentAdded($grpc.ServiceCall call, $0.ActorAttachmentAddedRequest request);
-
-  $async.Future<$0.ActorAttachmentRemovedResponse> attachmentRemoved_Pre($grpc.ServiceCall $call, $async.Future<$0.ActorAttachmentRemovedRequest> $request) async {
+  $async.Future<$1.ActorAttachmentRemovedResponse> attachmentRemoved_Pre($grpc.ServiceCall $call, $async.Future<$1.ActorAttachmentRemovedRequest> $request) async {
    return attachmentRemoved($call, await $request);
  }

-  $async.Future<$0.ActorAttachmentRemovedResponse> attachmentRemoved($grpc.ServiceCall call, $0.ActorAttachmentRemovedRequest request);
-
-  $async.Future<$0.ActorClaimAddedResponse> claimAdded_Pre($grpc.ServiceCall $call, $async.Future<$0.ActorClaimAddedRequest> $request) async {
+  $async.Future<$1.ActorClaimAddedResponse> claimAdded_Pre($grpc.ServiceCall $call, $async.Future<$1.ActorClaimAddedRequest> $request) async {
    return claimAdded($call, await $request);
  }

-  $async.Future<$0.ActorClaimAddedResponse> claimAdded($grpc.ServiceCall call, $0.ActorClaimAddedRequest request);
-
-  $async.Future<$0.ActorMetaDataUpdatedResponse> metaDataUpdated_Pre($grpc.ServiceCall $call, $async.Future<$0.ActorMetaDataUpdatedRequest> $request) async {
+  $async.Future<$1.ActorMetaDataUpdatedResponse> metaDataUpdated_Pre($grpc.ServiceCall $call, $async.Future<$1.ActorMetaDataUpdatedRequest> $request) async {
    return metaDataUpdated($call, await $request);
  }

-  $async.Future<$0.ActorMetaDataUpdatedResponse> metaDataUpdated($grpc.ServiceCall call, $0.ActorMetaDataUpdatedRequest request);
-
+  $async.Future<$1.ActorCreatedResponse> created($grpc.ServiceCall call, $1.ActorCreatedRequest request);
+  $async.Future<$1.ActorCreatedv2Response> createdv2($grpc.ServiceCall call, $1.ActorCreatedv2Request request);
+  $async.Future<$1.ActorDeletedResponse> deleted($grpc.ServiceCall call, $1.ActorDeletedRequest request);
+  $async.Future<$1.ActorSnapshotCompletedResponse> snapshotCompleted($grpc.ServiceCall call, $1.ActorSnapshotCompletedRequest request);
+  $async.Future<$1.ActorAttachmentAddedResponse> attachmentAdded($grpc.ServiceCall call, $1.ActorAttachmentAddedRequest request);
+  $async.Future<$1.ActorAttachmentRemovedResponse> attachmentRemoved($grpc.ServiceCall call, $1.ActorAttachmentRemovedRequest request);
+  $async.Future<$1.ActorClaimAddedResponse> claimAdded($grpc.ServiceCall call, $1.ActorClaimAddedRequest request);
+  $async.Future<$1.ActorMetaDataUpdatedResponse> metaDataUpdated($grpc.ServiceCall call, $1.ActorMetaDataUpdatedRequest request);
 }
--- a/lib/actorInput.pbjson.dart
+++ b/lib/actorInput.pbjson.dart
@@ -1,14 +1,13 @@
-// This is a generated file - do not edit.
 //
-// Generated from actorInput.proto.
-
+//  Generated code. Do not modify.
+//  source: actorInput.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
@@ -291,7 +290,7 @@ const ActorSnapshotCompletedPayload$json = {
 final $typed_data.Uint8List actorSnapshotCompletedPayloadDescriptor = $convert.base64Decode(
    'Ch1BY3RvclNuYXBzaG90Q29tcGxldGVkUGF5bG9hZBI4CghTbmFwc2hvdBgBIAEoCzISLmFwaS'
    '5BY3RvclNuYXBzaG90Qgj6QgWKAQIQAVIIU25hcHNob3Q6RJJBDQoL0gEIU25hcHNob3SiuxgF'
-    'RXZlbnSouxgBursYEVNuYXBzaG90Q29tcGxldGVk2rsYDnJlamVjdFNuYXBzaG90');
+    'RXZlbnSouxgBursYEVNuYXBzaG90Q29tcGxldGVk2rsYDlJlamVjdFNuYXBzaG90');

@$core.Deprecated('Use actorSnapshotCompletedEventDescriptor instead')
 const ActorSnapshotCompletedEvent$json = {
--- a/lib/actorQuery.pb.dart
+++ b/lib/actorQuery.pb.dart
@@ -1,60 +1,62 @@
-// This is a generated file - do not edit.
 //
-// Generated from actorQuery.proto.
-
+//  Generated code. Do not modify.
+//  source: actorQuery.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:core' as $core;

 import 'package:protobuf/protobuf.dart' as $pb;

-import 'actor.pb.dart' as $2;
-import 'shared.pb.dart' as $1;
+import 'actor.pb.dart' as $67;
+import 'shared.pb.dart' as $3;

 export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;

 class ActorByIdQuery extends $pb.GeneratedMessage {
  factory ActorByIdQuery({
-    $1.QueryProjectHeader? header,
-    $core.Iterable<$1.EntityID>? iDs,
-    ActorQueryOptions? options,
+    $3.QueryProjectHeader? header,
+    $core.Iterable<$3.EntityID>? iDs,
  }) {
-    final result = create();
-    if (header != null) result.header = header;
-    if (iDs != null) result.iDs.addAll(iDs);
-    if (options != null) result.options = options;
-    return result;
+    final $result = create();
+    if (header != null) {
+      $result.header = header;
+    }
+    if (iDs != null) {
+      $result.iDs.addAll(iDs);
+    }
+    return $result;
  }
-
-  ActorByIdQuery._();
-
-  factory ActorByIdQuery.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory ActorByIdQuery.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  ActorByIdQuery._() : super();
+  factory ActorByIdQuery.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory ActorByIdQuery.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ActorByIdQuery', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$1.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.QueryProjectHeader.create)
-    ..pc<$1.EntityID>(2, _omitFieldNames ? '' : 'IDs', $pb.PbFieldType.PM, protoName: 'IDs', subBuilder: $1.EntityID.create)
-    ..aOM<ActorQueryOptions>(3, _omitFieldNames ? '' : 'Options', protoName: 'Options', subBuilder: ActorQueryOptions.create)
+    ..aOM<$3.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.QueryProjectHeader.create)
+    ..pc<$3.EntityID>(2, _omitFieldNames ? '' : 'IDs', $pb.PbFieldType.PM, protoName: 'IDs', subBuilder: $3.EntityID.create)
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  ActorByIdQuery clone() => ActorByIdQuery()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  ActorByIdQuery copyWith(void Function(ActorByIdQuery) updates) => super.copyWith((message) => updates(message as ActorByIdQuery)) as ActorByIdQuery;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static ActorByIdQuery create() => ActorByIdQuery._();
-  @$core.override
  ActorByIdQuery createEmptyInstance() => create();
  static $pb.PbList<ActorByIdQuery> createRepeated() => $pb.PbList<ActorByIdQuery>();
  @$core.pragma('dart2js:noInline')
@@ -62,64 +64,59 @@ class ActorByIdQuery extends $pb.GeneratedMessage {
  static ActorByIdQuery? _defaultInstance;

  @$pb.TagNumber(1)
-  $1.QueryProjectHeader get header => $_getN(0);
+  $3.QueryProjectHeader get header => $_getN(0);
  @$pb.TagNumber(1)
-  set header($1.QueryProjectHeader value) => $_setField(1, value);
+  set header($3.QueryProjectHeader v) { $_setField(1, v); }
  @$pb.TagNumber(1)
  $core.bool hasHeader() => $_has(0);
  @$pb.TagNumber(1)
  void clearHeader() => $_clearField(1);
  @$pb.TagNumber(1)
-  $1.QueryProjectHeader ensureHeader() => $_ensure(0);
+  $3.QueryProjectHeader ensureHeader() => $_ensure(0);

  @$pb.TagNumber(2)
-  $pb.PbList<$1.EntityID> get iDs => $_getList(1);
-
-  @$pb.TagNumber(3)
-  ActorQueryOptions get options => $_getN(2);
-  @$pb.TagNumber(3)
-  set options(ActorQueryOptions value) => $_setField(3, value);
-  @$pb.TagNumber(3)
-  $core.bool hasOptions() => $_has(2);
-  @$pb.TagNumber(3)
-  void clearOptions() => $_clearField(3);
-  @$pb.TagNumber(3)
-  ActorQueryOptions ensureOptions() => $_ensure(2);
+  $pb.PbList<$3.EntityID> get iDs => $_getList(1);
 }

 class ActorByIdResult extends $pb.GeneratedMessage {
  factory ActorByIdResult({
-    $1.ResultHeader? header,
-    $core.Iterable<$2.Actor>? objects,
+    $3.ResultHeader? header,
+    $core.Iterable<$67.Actor>? objects,
  }) {
-    final result = create();
-    if (header != null) result.header = header;
-    if (objects != null) result.objects.addAll(objects);
-    return result;
+    final $result = create();
+    if (header != null) {
+      $result.header = header;
+    }
+    if (objects != null) {
+      $result.objects.addAll(objects);
+    }
+    return $result;
  }
-
-  ActorByIdResult._();
-
-  factory ActorByIdResult.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory ActorByIdResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  ActorByIdResult._() : super();
+  factory ActorByIdResult.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory ActorByIdResult.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ActorByIdResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$1.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.ResultHeader.create)
-    ..pc<$2.Actor>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $2.Actor.create)
+    ..aOM<$3.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.ResultHeader.create)
+    ..pc<$67.Actor>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $67.Actor.create)
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  ActorByIdResult clone() => ActorByIdResult()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  ActorByIdResult copyWith(void Function(ActorByIdResult) updates) => super.copyWith((message) => updates(message as ActorByIdResult)) as ActorByIdResult;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static ActorByIdResult create() => ActorByIdResult._();
-  @$core.override
  ActorByIdResult createEmptyInstance() => create();
  static $pb.PbList<ActorByIdResult> createRepeated() => $pb.PbList<ActorByIdResult>();
  @$core.pragma('dart2js:noInline')
@@ -127,62 +124,69 @@ class ActorByIdResult extends $pb.GeneratedMessage {
  static ActorByIdResult? _defaultInstance;

  @$pb.TagNumber(1)
-  $1.ResultHeader get header => $_getN(0);
+  $3.ResultHeader get header => $_getN(0);
  @$pb.TagNumber(1)
-  set header($1.ResultHeader value) => $_setField(1, value);
+  set header($3.ResultHeader v) { $_setField(1, v); }
  @$pb.TagNumber(1)
  $core.bool hasHeader() => $_has(0);
  @$pb.TagNumber(1)
  void clearHeader() => $_clearField(1);
  @$pb.TagNumber(1)
-  $1.ResultHeader ensureHeader() => $_ensure(0);
+  $3.ResultHeader ensureHeader() => $_ensure(0);

  @$pb.TagNumber(2)
-  $pb.PbList<$2.Actor> get objects => $_getList(1);
+  $pb.PbList<$67.Actor> get objects => $_getList(1);
 }

 class ActorByFilterQuery extends $pb.GeneratedMessage {
  factory ActorByFilterQuery({
-    $1.QueryProjectHeader? header,
+    $3.QueryProjectHeader? header,
    $core.String? limitFilter,
    $core.String? queryContext,
-    $core.Iterable<$1.BlockFilter>? blockFilters,
-    ActorQueryOptions? options,
+    $core.Iterable<$3.BlockFilter>? blockFilters,
  }) {
-    final result = create();
-    if (header != null) result.header = header;
-    if (limitFilter != null) result.limitFilter = limitFilter;
-    if (queryContext != null) result.queryContext = queryContext;
-    if (blockFilters != null) result.blockFilters.addAll(blockFilters);
-    if (options != null) result.options = options;
-    return result;
+    final $result = create();
+    if (header != null) {
+      $result.header = header;
+    }
+    if (limitFilter != null) {
+      $result.limitFilter = limitFilter;
+    }
+    if (queryContext != null) {
+      $result.queryContext = queryContext;
+    }
+    if (blockFilters != null) {
+      $result.blockFilters.addAll(blockFilters);
+    }
+    return $result;
  }
-
-  ActorByFilterQuery._();
-
-  factory ActorByFilterQuery.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory ActorByFilterQuery.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  ActorByFilterQuery._() : super();
+  factory ActorByFilterQuery.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory ActorByFilterQuery.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ActorByFilterQuery', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$1.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.QueryProjectHeader.create)
+    ..aOM<$3.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.QueryProjectHeader.create)
    ..aOS(4, _omitFieldNames ? '' : 'limitFilter', protoName: 'limitFilter')
    ..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)
+    ..pc<$3.BlockFilter>(6, _omitFieldNames ? '' : 'BlockFilters', $pb.PbFieldType.PM, protoName: 'BlockFilters', subBuilder: $3.BlockFilter.create)
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  ActorByFilterQuery clone() => ActorByFilterQuery()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  ActorByFilterQuery copyWith(void Function(ActorByFilterQuery) updates) => super.copyWith((message) => updates(message as ActorByFilterQuery)) as ActorByFilterQuery;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static ActorByFilterQuery create() => ActorByFilterQuery._();
-  @$core.override
  ActorByFilterQuery createEmptyInstance() => create();
  static $pb.PbList<ActorByFilterQuery> createRepeated() => $pb.PbList<ActorByFilterQuery>();
  @$core.pragma('dart2js:noInline')
@@ -190,21 +194,21 @@ class ActorByFilterQuery extends $pb.GeneratedMessage {
  static ActorByFilterQuery? _defaultInstance;

  @$pb.TagNumber(1)
-  $1.QueryProjectHeader get header => $_getN(0);
+  $3.QueryProjectHeader get header => $_getN(0);
  @$pb.TagNumber(1)
-  set header($1.QueryProjectHeader value) => $_setField(1, value);
+  set header($3.QueryProjectHeader v) { $_setField(1, v); }
  @$pb.TagNumber(1)
  $core.bool hasHeader() => $_has(0);
  @$pb.TagNumber(1)
  void clearHeader() => $_clearField(1);
  @$pb.TagNumber(1)
-  $1.QueryProjectHeader ensureHeader() => $_ensure(0);
+  $3.QueryProjectHeader ensureHeader() => $_ensure(0);

  /// Number of maximum result
  @$pb.TagNumber(4)
  $core.String get limitFilter => $_getSZ(1);
  @$pb.TagNumber(4)
-  set limitFilter($core.String value) => $_setString(1, value);
+  set limitFilter($core.String v) { $_setString(1, v); }
  @$pb.TagNumber(4)
  $core.bool hasLimitFilter() => $_has(1);
  @$pb.TagNumber(4)
@@ -213,7 +217,7 @@ class ActorByFilterQuery extends $pb.GeneratedMessage {
  @$pb.TagNumber(5)
  $core.String get queryContext => $_getSZ(2);
  @$pb.TagNumber(5)
-  set queryContext($core.String value) => $_setString(2, value);
+  set queryContext($core.String v) { $_setString(2, v); }
  @$pb.TagNumber(5)
  $core.bool hasQueryContext() => $_has(2);
  @$pb.TagNumber(5)
@@ -221,56 +225,53 @@ class ActorByFilterQuery extends $pb.GeneratedMessage {

  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query, if not empty, simpleFilters (deprecated) & rangeFilters (deprecated) will be ignored
  @$pb.TagNumber(6)
-  $pb.PbList<$1.BlockFilter> get blockFilters => $_getList(3);
-
-  @$pb.TagNumber(7)
-  ActorQueryOptions get options => $_getN(4);
-  @$pb.TagNumber(7)
-  set options(ActorQueryOptions value) => $_setField(7, value);
-  @$pb.TagNumber(7)
-  $core.bool hasOptions() => $_has(4);
-  @$pb.TagNumber(7)
-  void clearOptions() => $_clearField(7);
-  @$pb.TagNumber(7)
-  ActorQueryOptions ensureOptions() => $_ensure(4);
+  $pb.PbList<$3.BlockFilter> get blockFilters => $_getList(3);
 }

 class ActorByFilterResult extends $pb.GeneratedMessage {
  factory ActorByFilterResult({
-    $1.ResultHeader? header,
-    $core.Iterable<$2.Actor>? objects,
+    $3.ResultHeader? header,
+    $core.Iterable<$67.Actor>? objects,
    $core.String? queryContext,
  }) {
-    final result = create();
-    if (header != null) result.header = header;
-    if (objects != null) result.objects.addAll(objects);
-    if (queryContext != null) result.queryContext = queryContext;
-    return result;
+    final $result = create();
+    if (header != null) {
+      $result.header = header;
+    }
+    if (objects != null) {
+      $result.objects.addAll(objects);
+    }
+    if (queryContext != null) {
+      $result.queryContext = queryContext;
+    }
+    return $result;
  }
-
-  ActorByFilterResult._();
-
-  factory ActorByFilterResult.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory ActorByFilterResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  ActorByFilterResult._() : super();
+  factory ActorByFilterResult.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory ActorByFilterResult.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ActorByFilterResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$1.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.ResultHeader.create)
-    ..pc<$2.Actor>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $2.Actor.create)
+    ..aOM<$3.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.ResultHeader.create)
+    ..pc<$67.Actor>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $67.Actor.create)
    ..aOS(3, _omitFieldNames ? '' : 'queryContext', protoName: 'queryContext')
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  ActorByFilterResult clone() => ActorByFilterResult()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  ActorByFilterResult copyWith(void Function(ActorByFilterResult) updates) => super.copyWith((message) => updates(message as ActorByFilterResult)) as ActorByFilterResult;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static ActorByFilterResult create() => ActorByFilterResult._();
-  @$core.override
  ActorByFilterResult createEmptyInstance() => create();
  static $pb.PbList<ActorByFilterResult> createRepeated() => $pb.PbList<ActorByFilterResult>();
  @$core.pragma('dart2js:noInline')
@@ -278,95 +279,73 @@ class ActorByFilterResult extends $pb.GeneratedMessage {
  static ActorByFilterResult? _defaultInstance;

  @$pb.TagNumber(1)
-  $1.ResultHeader get header => $_getN(0);
+  $3.ResultHeader get header => $_getN(0);
  @$pb.TagNumber(1)
-  set header($1.ResultHeader value) => $_setField(1, value);
+  set header($3.ResultHeader v) { $_setField(1, v); }
  @$pb.TagNumber(1)
  $core.bool hasHeader() => $_has(0);
  @$pb.TagNumber(1)
  void clearHeader() => $_clearField(1);
  @$pb.TagNumber(1)
-  $1.ResultHeader ensureHeader() => $_ensure(0);
+  $3.ResultHeader ensureHeader() => $_ensure(0);

  @$pb.TagNumber(2)
-  $pb.PbList<$2.Actor> get objects => $_getList(1);
+  $pb.PbList<$67.Actor> get objects => $_getList(1);

  @$pb.TagNumber(3)
  $core.String get queryContext => $_getSZ(2);
  @$pb.TagNumber(3)
-  set queryContext($core.String value) => $_setString(2, value);
+  set queryContext($core.String v) { $_setString(2, v); }
  @$pb.TagNumber(3)
  $core.bool hasQueryContext() => $_has(2);
  @$pb.TagNumber(3)
  void clearQueryContext() => $_clearField(3);
 }

-class ActorQueryOptions extends $pb.GeneratedMessage {
-  factory ActorQueryOptions() => create();
-
-  ActorQueryOptions._();
-
-  factory ActorQueryOptions.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory ActorQueryOptions.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ActorQueryOptions', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ActorQueryOptions clone() => ActorQueryOptions()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ActorQueryOptions copyWith(void Function(ActorQueryOptions) updates) => super.copyWith((message) => updates(message as ActorQueryOptions)) as ActorQueryOptions;
-
-  @$core.override
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static ActorQueryOptions create() => ActorQueryOptions._();
-  @$core.override
-  ActorQueryOptions createEmptyInstance() => create();
-  static $pb.PbList<ActorQueryOptions> createRepeated() => $pb.PbList<ActorQueryOptions>();
-  @$core.pragma('dart2js:noInline')
-  static ActorQueryOptions getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<ActorQueryOptions>(create);
-  static ActorQueryOptions? _defaultInstance;
-}
-
 class ActorByMatchQuery extends $pb.GeneratedMessage {
  factory ActorByMatchQuery({
-    $1.QueryProjectHeader? header,
-    $core.Iterable<$1.BlockFilter>? blockFilters,
-    $core.Iterable<$1.MatchField>? matchFields,
+    $3.QueryProjectHeader? header,
+    $core.Iterable<$3.BlockFilter>? blockFilters,
+    $core.Iterable<$3.MatchField>? matchFields,
  }) {
-    final result = create();
-    if (header != null) result.header = header;
-    if (blockFilters != null) result.blockFilters.addAll(blockFilters);
-    if (matchFields != null) result.matchFields.addAll(matchFields);
-    return result;
+    final $result = create();
+    if (header != null) {
+      $result.header = header;
+    }
+    if (blockFilters != null) {
+      $result.blockFilters.addAll(blockFilters);
+    }
+    if (matchFields != null) {
+      $result.matchFields.addAll(matchFields);
+    }
+    return $result;
  }
-
-  ActorByMatchQuery._();
-
-  factory ActorByMatchQuery.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory ActorByMatchQuery.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  ActorByMatchQuery._() : super();
+  factory ActorByMatchQuery.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory ActorByMatchQuery.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ActorByMatchQuery', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$1.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.QueryProjectHeader.create)
-    ..pc<$1.BlockFilter>(5, _omitFieldNames ? '' : 'BlockFilters', $pb.PbFieldType.PM, protoName: 'BlockFilters', subBuilder: $1.BlockFilter.create)
-    ..pc<$1.MatchField>(6, _omitFieldNames ? '' : 'MatchFields', $pb.PbFieldType.PM, protoName: 'MatchFields', subBuilder: $1.MatchField.create)
+    ..aOM<$3.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.QueryProjectHeader.create)
+    ..pc<$3.BlockFilter>(5, _omitFieldNames ? '' : 'BlockFilters', $pb.PbFieldType.PM, protoName: 'BlockFilters', subBuilder: $3.BlockFilter.create)
+    ..pc<$3.MatchField>(6, _omitFieldNames ? '' : 'MatchFields', $pb.PbFieldType.PM, protoName: 'MatchFields', subBuilder: $3.MatchField.create)
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  ActorByMatchQuery clone() => ActorByMatchQuery()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  ActorByMatchQuery copyWith(void Function(ActorByMatchQuery) updates) => super.copyWith((message) => updates(message as ActorByMatchQuery)) as ActorByMatchQuery;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static ActorByMatchQuery create() => ActorByMatchQuery._();
-  @$core.override
  ActorByMatchQuery createEmptyInstance() => create();
  static $pb.PbList<ActorByMatchQuery> createRepeated() => $pb.PbList<ActorByMatchQuery>();
  @$core.pragma('dart2js:noInline')
@@ -374,55 +353,59 @@ class ActorByMatchQuery extends $pb.GeneratedMessage {
  static ActorByMatchQuery? _defaultInstance;

  @$pb.TagNumber(1)
-  $1.QueryProjectHeader get header => $_getN(0);
+  $3.QueryProjectHeader get header => $_getN(0);
  @$pb.TagNumber(1)
-  set header($1.QueryProjectHeader value) => $_setField(1, value);
+  set header($3.QueryProjectHeader v) { $_setField(1, v); }
  @$pb.TagNumber(1)
  $core.bool hasHeader() => $_has(0);
  @$pb.TagNumber(1)
  void clearHeader() => $_clearField(1);
  @$pb.TagNumber(1)
-  $1.QueryProjectHeader ensureHeader() => $_ensure(0);
+  $3.QueryProjectHeader ensureHeader() => $_ensure(0);

  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query, if not empty, simpleFilters (deprecated) & rangeFilters (deprecated) will be ignored
  @$pb.TagNumber(5)
-  $pb.PbList<$1.BlockFilter> get blockFilters => $_getList(1);
+  $pb.PbList<$3.BlockFilter> get blockFilters => $_getList(1);

  /// MatchField list structure, for FindMatching query
  @$pb.TagNumber(6)
-  $pb.PbList<$1.MatchField> get matchFields => $_getList(2);
+  $pb.PbList<$3.MatchField> get matchFields => $_getList(2);
 }

 class ActorByMatchResult extends $pb.GeneratedMessage {
  factory ActorByMatchResult({
-    $core.Iterable<$1.MatchFieldResult>? matchResults,
+    $core.Iterable<$3.MatchFieldResult>? matchResults,
  }) {
-    final result = create();
-    if (matchResults != null) result.matchResults.addAll(matchResults);
-    return result;
+    final $result = create();
+    if (matchResults != null) {
+      $result.matchResults.addAll(matchResults);
+    }
+    return $result;
  }
-
-  ActorByMatchResult._();
-
-  factory ActorByMatchResult.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory ActorByMatchResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  ActorByMatchResult._() : super();
+  factory ActorByMatchResult.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory ActorByMatchResult.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ActorByMatchResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..pc<$1.MatchFieldResult>(2, _omitFieldNames ? '' : 'MatchResults', $pb.PbFieldType.PM, protoName: 'MatchResults', subBuilder: $1.MatchFieldResult.create)
+    ..pc<$3.MatchFieldResult>(2, _omitFieldNames ? '' : 'MatchResults', $pb.PbFieldType.PM, protoName: 'MatchResults', subBuilder: $3.MatchFieldResult.create)
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  ActorByMatchResult clone() => ActorByMatchResult()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  ActorByMatchResult copyWith(void Function(ActorByMatchResult) updates) => super.copyWith((message) => updates(message as ActorByMatchResult)) as ActorByMatchResult;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static ActorByMatchResult create() => ActorByMatchResult._();
-  @$core.override
  ActorByMatchResult createEmptyInstance() => create();
  static $pb.PbList<ActorByMatchResult> createRepeated() => $pb.PbList<ActorByMatchResult>();
  @$core.pragma('dart2js:noInline')
@@ -430,9 +413,9 @@ class ActorByMatchResult extends $pb.GeneratedMessage {
  static ActorByMatchResult? _defaultInstance;

  @$pb.TagNumber(2)
-  $pb.PbList<$1.MatchFieldResult> get matchResults => $_getList(0);
+  $pb.PbList<$3.MatchFieldResult> get matchResults => $_getList(0);
 }


-const $core.bool _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
-const $core.bool _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
+const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
+const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
--- a/lib/actorQuery.pbenum.dart
+++ b/lib/actorQuery.pbenum.dart
@@ -1,12 +1,11 @@
-// This is a generated file - do not edit.
 //
-// Generated from actorQuery.proto.
-
+//  Generated code. Do not modify.
+//  source: actorQuery.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

--- a/lib/actorQuery.pbgrpc.dart
+++ b/lib/actorQuery.pbgrpc.dart
@@ -1,14 +1,13 @@
-// This is a generated file - do not edit.
 //
-// Generated from actorQuery.proto.
-
+//  Generated code. Do not modify.
+//  source: actorQuery.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:async' as $async;
 import 'dart:core' as $core;
@@ -16,73 +15,63 @@ import 'dart:core' as $core;
 import 'package:grpc/service_api.dart' as $grpc;
 import 'package:protobuf/protobuf.dart' as $pb;

-import 'actorQuery.pb.dart' as $0;
-import 'shared.pb.dart' as $1;
+import 'actorQuery.pb.dart' as $2;
+import 'shared.pb.dart' as $3;

 export 'actorQuery.pb.dart';

@$pb.GrpcServiceName('api.ActorQuery')
 class ActorQueryClient extends $grpc.Client {
-  /// The hostname for this service.
-  static const $core.String defaultHost = '';
-
-  /// OAuth scopes needed for the client.
-  static const $core.List<$core.String> oauthScopes = [
-    '',
-  ];
+  static final _$getByIds = $grpc.ClientMethod<$2.ActorByIdQuery, $2.ActorByIdResult>(
+      '/api.ActorQuery/GetByIds',
+      ($2.ActorByIdQuery value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $2.ActorByIdResult.fromBuffer(value));
+  static final _$find = $grpc.ClientMethod<$2.ActorByFilterQuery, $2.ActorByFilterResult>(
+      '/api.ActorQuery/Find',
+      ($2.ActorByFilterQuery value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $2.ActorByFilterResult.fromBuffer(value));
+  static final _$findMatchingFieldValues = $grpc.ClientMethod<$2.ActorByMatchQuery, $2.ActorByMatchResult>(
+      '/api.ActorQuery/FindMatchingFieldValues',
+      ($2.ActorByMatchQuery value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $2.ActorByMatchResult.fromBuffer(value));
+  static final _$findMatchingFieldElements = $grpc.ClientMethod<$3.ElementByMatchQuery, $3.ElementByMatchResult>(
+      '/api.ActorQuery/FindMatchingFieldElements',
+      ($3.ElementByMatchQuery value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $3.ElementByMatchResult.fromBuffer(value));
+  static final _$extract = $grpc.ClientMethod<$3.ExtractQuery, $3.ExtractResult>(
+      '/api.ActorQuery/Extract',
+      ($3.ExtractQuery value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $3.ExtractResult.fromBuffer(value));
+  static final _$countLines = $grpc.ClientMethod<$3.CountLinesQuery, $3.CountLinesResult>(
+      '/api.ActorQuery/CountLines',
+      ($3.CountLinesQuery value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $3.CountLinesResult.fromBuffer(value));

  ActorQueryClient(super.channel, {super.options, super.interceptors});

-  $grpc.ResponseFuture<$0.ActorByIdResult> getByIds($0.ActorByIdQuery request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$2.ActorByIdResult> getByIds($2.ActorByIdQuery request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$getByIds, request, options: options);
  }

-  $grpc.ResponseFuture<$0.ActorByFilterResult> find($0.ActorByFilterQuery request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$2.ActorByFilterResult> find($2.ActorByFilterQuery request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$find, request, options: options);
  }

-  $grpc.ResponseFuture<$0.ActorByMatchResult> findMatchingFieldValues($0.ActorByMatchQuery request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$2.ActorByMatchResult> findMatchingFieldValues($2.ActorByMatchQuery request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$findMatchingFieldValues, request, options: options);
  }

-  $grpc.ResponseFuture<$1.ElementByMatchResult> findMatchingFieldElements($1.ElementByMatchQuery request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$3.ElementByMatchResult> findMatchingFieldElements($3.ElementByMatchQuery request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$findMatchingFieldElements, request, options: options);
  }

-  $grpc.ResponseFuture<$1.ExtractResult> extract($1.ExtractQuery request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$3.ExtractResult> extract($3.ExtractQuery request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$extract, request, options: options);
  }

-  $grpc.ResponseFuture<$1.CountLinesResult> countLines($1.CountLinesQuery request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$3.CountLinesResult> countLines($3.CountLinesQuery request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$countLines, request, options: options);
  }
-
-    // method descriptors
-
-  static final _$getByIds = $grpc.ClientMethod<$0.ActorByIdQuery, $0.ActorByIdResult>(
-      '/api.ActorQuery/GetByIds',
-      ($0.ActorByIdQuery value) => value.writeToBuffer(),
-      $0.ActorByIdResult.fromBuffer);
-  static final _$find = $grpc.ClientMethod<$0.ActorByFilterQuery, $0.ActorByFilterResult>(
-      '/api.ActorQuery/Find',
-      ($0.ActorByFilterQuery value) => value.writeToBuffer(),
-      $0.ActorByFilterResult.fromBuffer);
-  static final _$findMatchingFieldValues = $grpc.ClientMethod<$0.ActorByMatchQuery, $0.ActorByMatchResult>(
-      '/api.ActorQuery/FindMatchingFieldValues',
-      ($0.ActorByMatchQuery value) => value.writeToBuffer(),
-      $0.ActorByMatchResult.fromBuffer);
-  static final _$findMatchingFieldElements = $grpc.ClientMethod<$1.ElementByMatchQuery, $1.ElementByMatchResult>(
-      '/api.ActorQuery/FindMatchingFieldElements',
-      ($1.ElementByMatchQuery value) => value.writeToBuffer(),
-      $1.ElementByMatchResult.fromBuffer);
-  static final _$extract = $grpc.ClientMethod<$1.ExtractQuery, $1.ExtractResult>(
-      '/api.ActorQuery/Extract',
-      ($1.ExtractQuery value) => value.writeToBuffer(),
-      $1.ExtractResult.fromBuffer);
-  static final _$countLines = $grpc.ClientMethod<$1.CountLinesQuery, $1.CountLinesResult>(
-      '/api.ActorQuery/CountLines',
-      ($1.CountLinesQuery value) => value.writeToBuffer(),
-      $1.CountLinesResult.fromBuffer);
 }

@$pb.GrpcServiceName('api.ActorQuery')
@@ -90,84 +79,78 @@ abstract class ActorQueryServiceBase extends $grpc.Service {
  $core.String get $name => 'api.ActorQuery';

  ActorQueryServiceBase() {
-    $addMethod($grpc.ServiceMethod<$0.ActorByIdQuery, $0.ActorByIdResult>(
+    $addMethod($grpc.ServiceMethod<$2.ActorByIdQuery, $2.ActorByIdResult>(
        'GetByIds',
        getByIds_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.ActorByIdQuery.fromBuffer(value),
-        ($0.ActorByIdResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.ActorByFilterQuery, $0.ActorByFilterResult>(
+        ($core.List<$core.int> value) => $2.ActorByIdQuery.fromBuffer(value),
+        ($2.ActorByIdResult value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$2.ActorByFilterQuery, $2.ActorByFilterResult>(
        'Find',
        find_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.ActorByFilterQuery.fromBuffer(value),
-        ($0.ActorByFilterResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.ActorByMatchQuery, $0.ActorByMatchResult>(
+        ($core.List<$core.int> value) => $2.ActorByFilterQuery.fromBuffer(value),
+        ($2.ActorByFilterResult value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$2.ActorByMatchQuery, $2.ActorByMatchResult>(
        'FindMatchingFieldValues',
        findMatchingFieldValues_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.ActorByMatchQuery.fromBuffer(value),
-        ($0.ActorByMatchResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$1.ElementByMatchQuery, $1.ElementByMatchResult>(
+        ($core.List<$core.int> value) => $2.ActorByMatchQuery.fromBuffer(value),
+        ($2.ActorByMatchResult value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$3.ElementByMatchQuery, $3.ElementByMatchResult>(
        'FindMatchingFieldElements',
        findMatchingFieldElements_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $1.ElementByMatchQuery.fromBuffer(value),
-        ($1.ElementByMatchResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$1.ExtractQuery, $1.ExtractResult>(
+        ($core.List<$core.int> value) => $3.ElementByMatchQuery.fromBuffer(value),
+        ($3.ElementByMatchResult value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$3.ExtractQuery, $3.ExtractResult>(
        'Extract',
        extract_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $1.ExtractQuery.fromBuffer(value),
-        ($1.ExtractResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$1.CountLinesQuery, $1.CountLinesResult>(
+        ($core.List<$core.int> value) => $3.ExtractQuery.fromBuffer(value),
+        ($3.ExtractResult value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$3.CountLinesQuery, $3.CountLinesResult>(
        'CountLines',
        countLines_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $1.CountLinesQuery.fromBuffer(value),
-        ($1.CountLinesResult value) => value.writeToBuffer()));
+        ($core.List<$core.int> value) => $3.CountLinesQuery.fromBuffer(value),
+        ($3.CountLinesResult value) => value.writeToBuffer()));
  }

-  $async.Future<$0.ActorByIdResult> getByIds_Pre($grpc.ServiceCall $call, $async.Future<$0.ActorByIdQuery> $request) async {
+  $async.Future<$2.ActorByIdResult> getByIds_Pre($grpc.ServiceCall $call, $async.Future<$2.ActorByIdQuery> $request) async {
    return getByIds($call, await $request);
  }

-  $async.Future<$0.ActorByIdResult> getByIds($grpc.ServiceCall call, $0.ActorByIdQuery request);
-
-  $async.Future<$0.ActorByFilterResult> find_Pre($grpc.ServiceCall $call, $async.Future<$0.ActorByFilterQuery> $request) async {
+  $async.Future<$2.ActorByFilterResult> find_Pre($grpc.ServiceCall $call, $async.Future<$2.ActorByFilterQuery> $request) async {
    return find($call, await $request);
  }

-  $async.Future<$0.ActorByFilterResult> find($grpc.ServiceCall call, $0.ActorByFilterQuery request);
-
-  $async.Future<$0.ActorByMatchResult> findMatchingFieldValues_Pre($grpc.ServiceCall $call, $async.Future<$0.ActorByMatchQuery> $request) async {
+  $async.Future<$2.ActorByMatchResult> findMatchingFieldValues_Pre($grpc.ServiceCall $call, $async.Future<$2.ActorByMatchQuery> $request) async {
    return findMatchingFieldValues($call, await $request);
  }

-  $async.Future<$0.ActorByMatchResult> findMatchingFieldValues($grpc.ServiceCall call, $0.ActorByMatchQuery request);
-
-  $async.Future<$1.ElementByMatchResult> findMatchingFieldElements_Pre($grpc.ServiceCall $call, $async.Future<$1.ElementByMatchQuery> $request) async {
+  $async.Future<$3.ElementByMatchResult> findMatchingFieldElements_Pre($grpc.ServiceCall $call, $async.Future<$3.ElementByMatchQuery> $request) async {
    return findMatchingFieldElements($call, await $request);
  }

-  $async.Future<$1.ElementByMatchResult> findMatchingFieldElements($grpc.ServiceCall call, $1.ElementByMatchQuery request);
-
-  $async.Future<$1.ExtractResult> extract_Pre($grpc.ServiceCall $call, $async.Future<$1.ExtractQuery> $request) async {
+  $async.Future<$3.ExtractResult> extract_Pre($grpc.ServiceCall $call, $async.Future<$3.ExtractQuery> $request) async {
    return extract($call, await $request);
  }

-  $async.Future<$1.ExtractResult> extract($grpc.ServiceCall call, $1.ExtractQuery request);
-
-  $async.Future<$1.CountLinesResult> countLines_Pre($grpc.ServiceCall $call, $async.Future<$1.CountLinesQuery> $request) async {
+  $async.Future<$3.CountLinesResult> countLines_Pre($grpc.ServiceCall $call, $async.Future<$3.CountLinesQuery> $request) async {
    return countLines($call, await $request);
  }

-  $async.Future<$1.CountLinesResult> countLines($grpc.ServiceCall call, $1.CountLinesQuery request);
-
+  $async.Future<$2.ActorByIdResult> getByIds($grpc.ServiceCall call, $2.ActorByIdQuery request);
+  $async.Future<$2.ActorByFilterResult> find($grpc.ServiceCall call, $2.ActorByFilterQuery request);
+  $async.Future<$2.ActorByMatchResult> findMatchingFieldValues($grpc.ServiceCall call, $2.ActorByMatchQuery request);
+  $async.Future<$3.ElementByMatchResult> findMatchingFieldElements($grpc.ServiceCall call, $3.ElementByMatchQuery request);
+  $async.Future<$3.ExtractResult> extract($grpc.ServiceCall call, $3.ExtractQuery request);
+  $async.Future<$3.CountLinesResult> countLines($grpc.ServiceCall call, $3.CountLinesQuery request);
 }
--- a/lib/actorQuery.pbjson.dart
+++ b/lib/actorQuery.pbjson.dart
@@ -1,14 +1,13 @@
-// This is a generated file - do not edit.
 //
-// Generated from actorQuery.proto.
-
+//  Generated code. Do not modify.
+//  source: actorQuery.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
@@ -20,7 +19,6 @@ const ActorByIdQuery$json = {
  '2': [
    {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.QueryProjectHeader', '8': {}, '10': 'Header'},
    {'1': 'IDs', '3': 2, '4': 3, '5': 11, '6': '.api.EntityID', '8': {}, '10': 'IDs'},
-    {'1': 'Options', '3': 3, '4': 1, '5': 11, '6': '.api.ActorQueryOptions', '10': 'Options'},
  ],
  '7': {},
 };
@@ -29,8 +27,7 @@ const ActorByIdQuery$json = {
 final $typed_data.Uint8List actorByIdQueryDescriptor = $convert.base64Decode(
    'Cg5BY3RvckJ5SWRRdWVyeRI5CgZIZWFkZXIYASABKAsyFy5hcGkuUXVlcnlQcm9qZWN0SGVhZG'
    'VyQgj6QgWKAQIQAVIGSGVhZGVyEikKA0lEcxgCIAMoCzINLmFwaS5FbnRpdHlJREII+kIFkgEC'
-    'CAFSA0lEcxIwCgdPcHRpb25zGAMgASgLMhYuYXBpLkFjdG9yUXVlcnlPcHRpb25zUgdPcHRpb2'
-    '5zOh2SQREKD9IBBkhlYWRlctIBA0lEc6K7GAVRdWVyeQ==');
+    'CAFSA0lEczodkkERCg/SAQZIZWFkZXLSAQNJRHOiuxgFUXVlcnk=');

@$core.Deprecated('Use actorByIdResultDescriptor instead')
 const ActorByIdResult$json = {
@@ -56,7 +53,6 @@ const ActorByFilterQuery$json = {
    {'1': 'limitFilter', '3': 4, '4': 1, '5': 9, '8': {}, '10': 'limitFilter'},
    {'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'},
  ],
  '7': {},
 };
@@ -67,8 +63,7 @@ final $typed_data.Uint8List actorByFilterQueryDescriptor = $convert.base64Decode
    'hlYWRlckILkkEA+kIFigECEAFSBkhlYWRlchJGCgtsaW1pdEZpbHRlchgEIAEoCUIkkkEhMhhO'
    'dW1iZXIgb2YgbWF4aW11bSByZXN1bHRKBSI1MDAiUgtsaW1pdEZpbHRlchIiCgxxdWVyeUNvbn'
    'RleHQYBSABKAlSDHF1ZXJ5Q29udGV4dBI0CgxCbG9ja0ZpbHRlcnMYBiADKAsyEC5hcGkuQmxv'
-    'Y2tGaWx0ZXJSDEJsb2NrRmlsdGVycxIwCgdPcHRpb25zGAcgASgLMhYuYXBpLkFjdG9yUXVlcn'
-    'lPcHRpb25zUgdPcHRpb25zOg6SQQsKCdIBBkhlYWRlcg==');
+    'Y2tGaWx0ZXJSDEJsb2NrRmlsdGVyczoOkkELCgnSAQZIZWFkZXI=');

@$core.Deprecated('Use actorByFilterResultDescriptor instead')
 const ActorByFilterResult$json = {
@@ -86,15 +81,6 @@ final $typed_data.Uint8List actorByFilterResultDescriptor = $convert.base64Decod
    'JSBkhlYWRlchIkCgdPYmplY3RzGAIgAygLMgouYXBpLkFjdG9yUgdPYmplY3RzEiIKDHF1ZXJ5'
    'Q29udGV4dBgDIAEoCVIMcXVlcnlDb250ZXh0');

-@$core.Deprecated('Use actorQueryOptionsDescriptor instead')
-const ActorQueryOptions$json = {
-  '1': 'ActorQueryOptions',
-};
-
-/// Descriptor for `ActorQueryOptions`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List actorQueryOptionsDescriptor = $convert.base64Decode(
-    'ChFBY3RvclF1ZXJ5T3B0aW9ucw==');
-
@$core.Deprecated('Use actorByMatchQueryDescriptor instead')
 const ActorByMatchQuery$json = {
  '1': 'ActorByMatchQuery',
--- a/lib/adaptiveCard.pb.dart
+++ b/lib/adaptiveCard.pb.dart
@@ -1,14 +1,13 @@
-// This is a generated file - do not edit.
 //
-// Generated from adaptiveCard.proto.
-
+//  Generated code. Do not modify.
+//  source: adaptiveCard.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:core' as $core;

@@ -21,16 +20,18 @@ class AdaptiveCard extends $pb.GeneratedMessage {
    $core.String? name,
    $core.String? template,
  }) {
-    final result = create();
-    if (name != null) result.name = name;
-    if (template != null) result.template = template;
-    return result;
+    final $result = create();
+    if (name != null) {
+      $result.name = name;
+    }
+    if (template != null) {
+      $result.template = template;
+    }
+    return $result;
  }
-
-  AdaptiveCard._();
-
-  factory AdaptiveCard.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory AdaptiveCard.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  AdaptiveCard._() : super();
+  factory AdaptiveCard.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory AdaptiveCard.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'AdaptiveCard', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
    ..aOS(1, _omitFieldNames ? '' : 'Name', protoName: 'Name')
@@ -38,17 +39,21 @@ class AdaptiveCard extends $pb.GeneratedMessage {
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  AdaptiveCard clone() => AdaptiveCard()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  AdaptiveCard copyWith(void Function(AdaptiveCard) updates) => super.copyWith((message) => updates(message as AdaptiveCard)) as AdaptiveCard;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static AdaptiveCard create() => AdaptiveCard._();
-  @$core.override
  AdaptiveCard createEmptyInstance() => create();
  static $pb.PbList<AdaptiveCard> createRepeated() => $pb.PbList<AdaptiveCard>();
  @$core.pragma('dart2js:noInline')
@@ -58,7 +63,7 @@ class AdaptiveCard extends $pb.GeneratedMessage {
  @$pb.TagNumber(1)
  $core.String get name => $_getSZ(0);
  @$pb.TagNumber(1)
-  set name($core.String value) => $_setString(0, value);
+  set name($core.String v) { $_setString(0, v); }
  @$pb.TagNumber(1)
  $core.bool hasName() => $_has(0);
  @$pb.TagNumber(1)
@@ -67,7 +72,7 @@ class AdaptiveCard extends $pb.GeneratedMessage {
  @$pb.TagNumber(2)
  $core.String get template => $_getSZ(1);
  @$pb.TagNumber(2)
-  set template($core.String value) => $_setString(1, value);
+  set template($core.String v) { $_setString(1, v); }
  @$pb.TagNumber(2)
  $core.bool hasTemplate() => $_has(1);
  @$pb.TagNumber(2)
@@ -76,27 +81,29 @@ class AdaptiveCard extends $pb.GeneratedMessage {

 class ListAdaptiveCardRequest extends $pb.GeneratedMessage {
  factory ListAdaptiveCardRequest() => create();
-
-  ListAdaptiveCardRequest._();
-
-  factory ListAdaptiveCardRequest.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory ListAdaptiveCardRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  ListAdaptiveCardRequest._() : super();
+  factory ListAdaptiveCardRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory ListAdaptiveCardRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ListAdaptiveCardRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  ListAdaptiveCardRequest clone() => ListAdaptiveCardRequest()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  ListAdaptiveCardRequest copyWith(void Function(ListAdaptiveCardRequest) updates) => super.copyWith((message) => updates(message as ListAdaptiveCardRequest)) as ListAdaptiveCardRequest;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static ListAdaptiveCardRequest create() => ListAdaptiveCardRequest._();
-  @$core.override
  ListAdaptiveCardRequest createEmptyInstance() => create();
  static $pb.PbList<ListAdaptiveCardRequest> createRepeated() => $pb.PbList<ListAdaptiveCardRequest>();
  @$core.pragma('dart2js:noInline')
@@ -108,32 +115,36 @@ class ListAdaptiveCardResult extends $pb.GeneratedMessage {
  factory ListAdaptiveCardResult({
    $core.Iterable<AdaptiveCard>? adaptiveCards,
  }) {
-    final result = create();
-    if (adaptiveCards != null) result.adaptiveCards.addAll(adaptiveCards);
-    return result;
+    final $result = create();
+    if (adaptiveCards != null) {
+      $result.adaptiveCards.addAll(adaptiveCards);
+    }
+    return $result;
  }
-
-  ListAdaptiveCardResult._();
-
-  factory ListAdaptiveCardResult.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory ListAdaptiveCardResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  ListAdaptiveCardResult._() : super();
+  factory ListAdaptiveCardResult.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory ListAdaptiveCardResult.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ListAdaptiveCardResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
    ..pc<AdaptiveCard>(1, _omitFieldNames ? '' : 'AdaptiveCards', $pb.PbFieldType.PM, protoName: 'AdaptiveCards', subBuilder: AdaptiveCard.create)
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  ListAdaptiveCardResult clone() => ListAdaptiveCardResult()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  ListAdaptiveCardResult copyWith(void Function(ListAdaptiveCardResult) updates) => super.copyWith((message) => updates(message as ListAdaptiveCardResult)) as ListAdaptiveCardResult;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static ListAdaptiveCardResult create() => ListAdaptiveCardResult._();
-  @$core.override
  ListAdaptiveCardResult createEmptyInstance() => create();
  static $pb.PbList<ListAdaptiveCardResult> createRepeated() => $pb.PbList<ListAdaptiveCardResult>();
  @$core.pragma('dart2js:noInline')
@@ -148,32 +159,36 @@ class GetAdaptiveCardRequest extends $pb.GeneratedMessage {
  factory GetAdaptiveCardRequest({
    $core.String? name,
  }) {
-    final result = create();
-    if (name != null) result.name = name;
-    return result;
+    final $result = create();
+    if (name != null) {
+      $result.name = name;
+    }
+    return $result;
  }
-
-  GetAdaptiveCardRequest._();
-
-  factory GetAdaptiveCardRequest.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory GetAdaptiveCardRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  GetAdaptiveCardRequest._() : super();
+  factory GetAdaptiveCardRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory GetAdaptiveCardRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetAdaptiveCardRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
    ..aOS(1, _omitFieldNames ? '' : 'Name', protoName: 'Name')
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  GetAdaptiveCardRequest clone() => GetAdaptiveCardRequest()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  GetAdaptiveCardRequest copyWith(void Function(GetAdaptiveCardRequest) updates) => super.copyWith((message) => updates(message as GetAdaptiveCardRequest)) as GetAdaptiveCardRequest;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static GetAdaptiveCardRequest create() => GetAdaptiveCardRequest._();
-  @$core.override
  GetAdaptiveCardRequest createEmptyInstance() => create();
  static $pb.PbList<GetAdaptiveCardRequest> createRepeated() => $pb.PbList<GetAdaptiveCardRequest>();
  @$core.pragma('dart2js:noInline')
@@ -183,7 +198,7 @@ class GetAdaptiveCardRequest extends $pb.GeneratedMessage {
  @$pb.TagNumber(1)
  $core.String get name => $_getSZ(0);
  @$pb.TagNumber(1)
-  set name($core.String value) => $_setString(0, value);
+  set name($core.String v) { $_setString(0, v); }
  @$pb.TagNumber(1)
  $core.bool hasName() => $_has(0);
  @$pb.TagNumber(1)
@@ -194,32 +209,36 @@ class GetAdaptiveCardResult extends $pb.GeneratedMessage {
  factory GetAdaptiveCardResult({
    AdaptiveCard? adaptiveCard,
  }) {
-    final result = create();
-    if (adaptiveCard != null) result.adaptiveCard = adaptiveCard;
-    return result;
+    final $result = create();
+    if (adaptiveCard != null) {
+      $result.adaptiveCard = adaptiveCard;
+    }
+    return $result;
  }
-
-  GetAdaptiveCardResult._();
-
-  factory GetAdaptiveCardResult.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory GetAdaptiveCardResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  GetAdaptiveCardResult._() : super();
+  factory GetAdaptiveCardResult.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory GetAdaptiveCardResult.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetAdaptiveCardResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
    ..aOM<AdaptiveCard>(1, _omitFieldNames ? '' : 'AdaptiveCard', protoName: 'AdaptiveCard', subBuilder: AdaptiveCard.create)
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  GetAdaptiveCardResult clone() => GetAdaptiveCardResult()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  GetAdaptiveCardResult copyWith(void Function(GetAdaptiveCardResult) updates) => super.copyWith((message) => updates(message as GetAdaptiveCardResult)) as GetAdaptiveCardResult;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static GetAdaptiveCardResult create() => GetAdaptiveCardResult._();
-  @$core.override
  GetAdaptiveCardResult createEmptyInstance() => create();
  static $pb.PbList<GetAdaptiveCardResult> createRepeated() => $pb.PbList<GetAdaptiveCardResult>();
  @$core.pragma('dart2js:noInline')
@@ -229,7 +248,7 @@ class GetAdaptiveCardResult extends $pb.GeneratedMessage {
  @$pb.TagNumber(1)
  AdaptiveCard get adaptiveCard => $_getN(0);
  @$pb.TagNumber(1)
-  set adaptiveCard(AdaptiveCard value) => $_setField(1, value);
+  set adaptiveCard(AdaptiveCard v) { $_setField(1, v); }
  @$pb.TagNumber(1)
  $core.bool hasAdaptiveCard() => $_has(0);
  @$pb.TagNumber(1)
@@ -243,16 +262,18 @@ class CreateAdaptiveCardRequest extends $pb.GeneratedMessage {
    $core.String? template,
    $core.String? name,
  }) {
-    final result = create();
-    if (template != null) result.template = template;
-    if (name != null) result.name = name;
-    return result;
+    final $result = create();
+    if (template != null) {
+      $result.template = template;
+    }
+    if (name != null) {
+      $result.name = name;
+    }
+    return $result;
  }
-
-  CreateAdaptiveCardRequest._();
-
-  factory CreateAdaptiveCardRequest.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory CreateAdaptiveCardRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  CreateAdaptiveCardRequest._() : super();
+  factory CreateAdaptiveCardRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory CreateAdaptiveCardRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CreateAdaptiveCardRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
    ..aOS(1, _omitFieldNames ? '' : 'Template', protoName: 'Template')
@@ -260,17 +281,21 @@ class CreateAdaptiveCardRequest extends $pb.GeneratedMessage {
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  CreateAdaptiveCardRequest clone() => CreateAdaptiveCardRequest()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  CreateAdaptiveCardRequest copyWith(void Function(CreateAdaptiveCardRequest) updates) => super.copyWith((message) => updates(message as CreateAdaptiveCardRequest)) as CreateAdaptiveCardRequest;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static CreateAdaptiveCardRequest create() => CreateAdaptiveCardRequest._();
-  @$core.override
  CreateAdaptiveCardRequest createEmptyInstance() => create();
  static $pb.PbList<CreateAdaptiveCardRequest> createRepeated() => $pb.PbList<CreateAdaptiveCardRequest>();
  @$core.pragma('dart2js:noInline')
@@ -280,7 +305,7 @@ class CreateAdaptiveCardRequest extends $pb.GeneratedMessage {
  @$pb.TagNumber(1)
  $core.String get template => $_getSZ(0);
  @$pb.TagNumber(1)
-  set template($core.String value) => $_setString(0, value);
+  set template($core.String v) { $_setString(0, v); }
  @$pb.TagNumber(1)
  $core.bool hasTemplate() => $_has(0);
  @$pb.TagNumber(1)
@@ -289,7 +314,7 @@ class CreateAdaptiveCardRequest extends $pb.GeneratedMessage {
  @$pb.TagNumber(2)
  $core.String get name => $_getSZ(1);
  @$pb.TagNumber(2)
-  set name($core.String value) => $_setString(1, value);
+  set name($core.String v) { $_setString(1, v); }
  @$pb.TagNumber(2)
  $core.bool hasName() => $_has(1);
  @$pb.TagNumber(2)
@@ -300,32 +325,36 @@ class CreateAdaptiveCardResult extends $pb.GeneratedMessage {
  factory CreateAdaptiveCardResult({
    AdaptiveCard? adaptiveCard,
  }) {
-    final result = create();
-    if (adaptiveCard != null) result.adaptiveCard = adaptiveCard;
-    return result;
+    final $result = create();
+    if (adaptiveCard != null) {
+      $result.adaptiveCard = adaptiveCard;
+    }
+    return $result;
  }
-
-  CreateAdaptiveCardResult._();
-
-  factory CreateAdaptiveCardResult.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory CreateAdaptiveCardResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  CreateAdaptiveCardResult._() : super();
+  factory CreateAdaptiveCardResult.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory CreateAdaptiveCardResult.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CreateAdaptiveCardResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
    ..aOM<AdaptiveCard>(1, _omitFieldNames ? '' : 'AdaptiveCard', protoName: 'AdaptiveCard', subBuilder: AdaptiveCard.create)
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  CreateAdaptiveCardResult clone() => CreateAdaptiveCardResult()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  CreateAdaptiveCardResult copyWith(void Function(CreateAdaptiveCardResult) updates) => super.copyWith((message) => updates(message as CreateAdaptiveCardResult)) as CreateAdaptiveCardResult;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static CreateAdaptiveCardResult create() => CreateAdaptiveCardResult._();
-  @$core.override
  CreateAdaptiveCardResult createEmptyInstance() => create();
  static $pb.PbList<CreateAdaptiveCardResult> createRepeated() => $pb.PbList<CreateAdaptiveCardResult>();
  @$core.pragma('dart2js:noInline')
@@ -335,7 +364,7 @@ class CreateAdaptiveCardResult extends $pb.GeneratedMessage {
  @$pb.TagNumber(1)
  AdaptiveCard get adaptiveCard => $_getN(0);
  @$pb.TagNumber(1)
-  set adaptiveCard(AdaptiveCard value) => $_setField(1, value);
+  set adaptiveCard(AdaptiveCard v) { $_setField(1, v); }
  @$pb.TagNumber(1)
  $core.bool hasAdaptiveCard() => $_has(0);
  @$pb.TagNumber(1)
@@ -348,32 +377,36 @@ class UpdateAdaptiveCardRequest extends $pb.GeneratedMessage {
  factory UpdateAdaptiveCardRequest({
    AdaptiveCard? adaptiveCard,
  }) {
-    final result = create();
-    if (adaptiveCard != null) result.adaptiveCard = adaptiveCard;
-    return result;
+    final $result = create();
+    if (adaptiveCard != null) {
+      $result.adaptiveCard = adaptiveCard;
+    }
+    return $result;
  }
-
-  UpdateAdaptiveCardRequest._();
-
-  factory UpdateAdaptiveCardRequest.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory UpdateAdaptiveCardRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  UpdateAdaptiveCardRequest._() : super();
+  factory UpdateAdaptiveCardRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory UpdateAdaptiveCardRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'UpdateAdaptiveCardRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
    ..aOM<AdaptiveCard>(1, _omitFieldNames ? '' : 'AdaptiveCard', protoName: 'AdaptiveCard', subBuilder: AdaptiveCard.create)
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  UpdateAdaptiveCardRequest clone() => UpdateAdaptiveCardRequest()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  UpdateAdaptiveCardRequest copyWith(void Function(UpdateAdaptiveCardRequest) updates) => super.copyWith((message) => updates(message as UpdateAdaptiveCardRequest)) as UpdateAdaptiveCardRequest;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static UpdateAdaptiveCardRequest create() => UpdateAdaptiveCardRequest._();
-  @$core.override
  UpdateAdaptiveCardRequest createEmptyInstance() => create();
  static $pb.PbList<UpdateAdaptiveCardRequest> createRepeated() => $pb.PbList<UpdateAdaptiveCardRequest>();
  @$core.pragma('dart2js:noInline')
@@ -383,7 +416,7 @@ class UpdateAdaptiveCardRequest extends $pb.GeneratedMessage {
  @$pb.TagNumber(1)
  AdaptiveCard get adaptiveCard => $_getN(0);
  @$pb.TagNumber(1)
-  set adaptiveCard(AdaptiveCard value) => $_setField(1, value);
+  set adaptiveCard(AdaptiveCard v) { $_setField(1, v); }
  @$pb.TagNumber(1)
  $core.bool hasAdaptiveCard() => $_has(0);
  @$pb.TagNumber(1)
@@ -396,32 +429,36 @@ class UpdateAdaptiveCardResult extends $pb.GeneratedMessage {
  factory UpdateAdaptiveCardResult({
    AdaptiveCard? adaptiveCard,
  }) {
-    final result = create();
-    if (adaptiveCard != null) result.adaptiveCard = adaptiveCard;
-    return result;
+    final $result = create();
+    if (adaptiveCard != null) {
+      $result.adaptiveCard = adaptiveCard;
+    }
+    return $result;
  }
-
-  UpdateAdaptiveCardResult._();
-
-  factory UpdateAdaptiveCardResult.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory UpdateAdaptiveCardResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  UpdateAdaptiveCardResult._() : super();
+  factory UpdateAdaptiveCardResult.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory UpdateAdaptiveCardResult.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'UpdateAdaptiveCardResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
    ..aOM<AdaptiveCard>(1, _omitFieldNames ? '' : 'AdaptiveCard', protoName: 'AdaptiveCard', subBuilder: AdaptiveCard.create)
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  UpdateAdaptiveCardResult clone() => UpdateAdaptiveCardResult()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  UpdateAdaptiveCardResult copyWith(void Function(UpdateAdaptiveCardResult) updates) => super.copyWith((message) => updates(message as UpdateAdaptiveCardResult)) as UpdateAdaptiveCardResult;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static UpdateAdaptiveCardResult create() => UpdateAdaptiveCardResult._();
-  @$core.override
  UpdateAdaptiveCardResult createEmptyInstance() => create();
  static $pb.PbList<UpdateAdaptiveCardResult> createRepeated() => $pb.PbList<UpdateAdaptiveCardResult>();
  @$core.pragma('dart2js:noInline')
@@ -431,7 +468,7 @@ class UpdateAdaptiveCardResult extends $pb.GeneratedMessage {
  @$pb.TagNumber(1)
  AdaptiveCard get adaptiveCard => $_getN(0);
  @$pb.TagNumber(1)
-  set adaptiveCard(AdaptiveCard value) => $_setField(1, value);
+  set adaptiveCard(AdaptiveCard v) { $_setField(1, v); }
  @$pb.TagNumber(1)
  $core.bool hasAdaptiveCard() => $_has(0);
  @$pb.TagNumber(1)
@@ -444,32 +481,36 @@ class DeleteAdaptiveCardRequest extends $pb.GeneratedMessage {
  factory DeleteAdaptiveCardRequest({
    $core.String? name,
  }) {
-    final result = create();
-    if (name != null) result.name = name;
-    return result;
+    final $result = create();
+    if (name != null) {
+      $result.name = name;
+    }
+    return $result;
  }
-
-  DeleteAdaptiveCardRequest._();
-
-  factory DeleteAdaptiveCardRequest.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory DeleteAdaptiveCardRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  DeleteAdaptiveCardRequest._() : super();
+  factory DeleteAdaptiveCardRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory DeleteAdaptiveCardRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'DeleteAdaptiveCardRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
    ..aOS(1, _omitFieldNames ? '' : 'Name', protoName: 'Name')
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  DeleteAdaptiveCardRequest clone() => DeleteAdaptiveCardRequest()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  DeleteAdaptiveCardRequest copyWith(void Function(DeleteAdaptiveCardRequest) updates) => super.copyWith((message) => updates(message as DeleteAdaptiveCardRequest)) as DeleteAdaptiveCardRequest;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static DeleteAdaptiveCardRequest create() => DeleteAdaptiveCardRequest._();
-  @$core.override
  DeleteAdaptiveCardRequest createEmptyInstance() => create();
  static $pb.PbList<DeleteAdaptiveCardRequest> createRepeated() => $pb.PbList<DeleteAdaptiveCardRequest>();
  @$core.pragma('dart2js:noInline')
@@ -479,7 +520,7 @@ class DeleteAdaptiveCardRequest extends $pb.GeneratedMessage {
  @$pb.TagNumber(1)
  $core.String get name => $_getSZ(0);
  @$pb.TagNumber(1)
-  set name($core.String value) => $_setString(0, value);
+  set name($core.String v) { $_setString(0, v); }
  @$pb.TagNumber(1)
  $core.bool hasName() => $_has(0);
  @$pb.TagNumber(1)
@@ -488,27 +529,29 @@ class DeleteAdaptiveCardRequest extends $pb.GeneratedMessage {

 class DeleteAdaptiveCardResult extends $pb.GeneratedMessage {
  factory DeleteAdaptiveCardResult() => create();
-
-  DeleteAdaptiveCardResult._();
-
-  factory DeleteAdaptiveCardResult.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory DeleteAdaptiveCardResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  DeleteAdaptiveCardResult._() : super();
+  factory DeleteAdaptiveCardResult.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory DeleteAdaptiveCardResult.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'DeleteAdaptiveCardResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  DeleteAdaptiveCardResult clone() => DeleteAdaptiveCardResult()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  DeleteAdaptiveCardResult copyWith(void Function(DeleteAdaptiveCardResult) updates) => super.copyWith((message) => updates(message as DeleteAdaptiveCardResult)) as DeleteAdaptiveCardResult;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static DeleteAdaptiveCardResult create() => DeleteAdaptiveCardResult._();
-  @$core.override
  DeleteAdaptiveCardResult createEmptyInstance() => create();
  static $pb.PbList<DeleteAdaptiveCardResult> createRepeated() => $pb.PbList<DeleteAdaptiveCardResult>();
  @$core.pragma('dart2js:noInline')
@@ -517,5 +560,5 @@ class DeleteAdaptiveCardResult extends $pb.GeneratedMessage {
 }


-const $core.bool _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
-const $core.bool _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
+const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
+const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
--- a/lib/adaptiveCard.pbenum.dart
+++ b/lib/adaptiveCard.pbenum.dart
@@ -1,12 +1,11 @@
-// This is a generated file - do not edit.
 //
-// Generated from adaptiveCard.proto.
-
+//  Generated code. Do not modify.
+//  source: adaptiveCard.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

--- a/lib/adaptiveCard.pbgrpc.dart
+++ b/lib/adaptiveCard.pbgrpc.dart
@@ -1,14 +1,13 @@
-// This is a generated file - do not edit.
 //
-// Generated from adaptiveCard.proto.
-
+//  Generated code. Do not modify.
+//  source: adaptiveCard.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:async' as $async;
 import 'dart:core' as $core;
@@ -16,64 +15,54 @@ import 'dart:core' as $core;
 import 'package:grpc/service_api.dart' as $grpc;
 import 'package:protobuf/protobuf.dart' as $pb;

-import 'adaptiveCard.pb.dart' as $0;
+import 'adaptiveCard.pb.dart' as $4;

 export 'adaptiveCard.pb.dart';

@$pb.GrpcServiceName('api.AdaptiveCardService')
 class AdaptiveCardServiceClient extends $grpc.Client {
-  /// The hostname for this service.
-  static const $core.String defaultHost = '';
-
-  /// OAuth scopes needed for the client.
-  static const $core.List<$core.String> oauthScopes = [
-    '',
-  ];
+  static final _$get = $grpc.ClientMethod<$4.GetAdaptiveCardRequest, $4.GetAdaptiveCardResult>(
+      '/api.AdaptiveCardService/Get',
+      ($4.GetAdaptiveCardRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $4.GetAdaptiveCardResult.fromBuffer(value));
+  static final _$list = $grpc.ClientMethod<$4.ListAdaptiveCardRequest, $4.ListAdaptiveCardResult>(
+      '/api.AdaptiveCardService/List',
+      ($4.ListAdaptiveCardRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $4.ListAdaptiveCardResult.fromBuffer(value));
+  static final _$create = $grpc.ClientMethod<$4.CreateAdaptiveCardRequest, $4.CreateAdaptiveCardResult>(
+      '/api.AdaptiveCardService/Create',
+      ($4.CreateAdaptiveCardRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $4.CreateAdaptiveCardResult.fromBuffer(value));
+  static final _$update = $grpc.ClientMethod<$4.UpdateAdaptiveCardRequest, $4.UpdateAdaptiveCardResult>(
+      '/api.AdaptiveCardService/Update',
+      ($4.UpdateAdaptiveCardRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $4.UpdateAdaptiveCardResult.fromBuffer(value));
+  static final _$delete = $grpc.ClientMethod<$4.DeleteAdaptiveCardRequest, $4.DeleteAdaptiveCardResult>(
+      '/api.AdaptiveCardService/Delete',
+      ($4.DeleteAdaptiveCardRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $4.DeleteAdaptiveCardResult.fromBuffer(value));

  AdaptiveCardServiceClient(super.channel, {super.options, super.interceptors});

-  $grpc.ResponseFuture<$0.GetAdaptiveCardResult> get($0.GetAdaptiveCardRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$4.GetAdaptiveCardResult> get($4.GetAdaptiveCardRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$get, request, options: options);
  }

-  $grpc.ResponseFuture<$0.ListAdaptiveCardResult> list($0.ListAdaptiveCardRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$4.ListAdaptiveCardResult> list($4.ListAdaptiveCardRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$list, request, options: options);
  }

-  $grpc.ResponseFuture<$0.CreateAdaptiveCardResult> create($0.CreateAdaptiveCardRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$4.CreateAdaptiveCardResult> create($4.CreateAdaptiveCardRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$create, request, options: options);
  }

-  $grpc.ResponseFuture<$0.UpdateAdaptiveCardResult> update($0.UpdateAdaptiveCardRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$4.UpdateAdaptiveCardResult> update($4.UpdateAdaptiveCardRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$update, request, options: options);
  }

-  $grpc.ResponseFuture<$0.DeleteAdaptiveCardResult> delete($0.DeleteAdaptiveCardRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$4.DeleteAdaptiveCardResult> delete($4.DeleteAdaptiveCardRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$delete, request, options: options);
  }
-
-    // method descriptors
-
-  static final _$get = $grpc.ClientMethod<$0.GetAdaptiveCardRequest, $0.GetAdaptiveCardResult>(
-      '/api.AdaptiveCardService/Get',
-      ($0.GetAdaptiveCardRequest value) => value.writeToBuffer(),
-      $0.GetAdaptiveCardResult.fromBuffer);
-  static final _$list = $grpc.ClientMethod<$0.ListAdaptiveCardRequest, $0.ListAdaptiveCardResult>(
-      '/api.AdaptiveCardService/List',
-      ($0.ListAdaptiveCardRequest value) => value.writeToBuffer(),
-      $0.ListAdaptiveCardResult.fromBuffer);
-  static final _$create = $grpc.ClientMethod<$0.CreateAdaptiveCardRequest, $0.CreateAdaptiveCardResult>(
-      '/api.AdaptiveCardService/Create',
-      ($0.CreateAdaptiveCardRequest value) => value.writeToBuffer(),
-      $0.CreateAdaptiveCardResult.fromBuffer);
-  static final _$update = $grpc.ClientMethod<$0.UpdateAdaptiveCardRequest, $0.UpdateAdaptiveCardResult>(
-      '/api.AdaptiveCardService/Update',
-      ($0.UpdateAdaptiveCardRequest value) => value.writeToBuffer(),
-      $0.UpdateAdaptiveCardResult.fromBuffer);
-  static final _$delete = $grpc.ClientMethod<$0.DeleteAdaptiveCardRequest, $0.DeleteAdaptiveCardResult>(
-      '/api.AdaptiveCardService/Delete',
-      ($0.DeleteAdaptiveCardRequest value) => value.writeToBuffer(),
-      $0.DeleteAdaptiveCardResult.fromBuffer);
 }

@$pb.GrpcServiceName('api.AdaptiveCardService')
@@ -81,71 +70,66 @@ abstract class AdaptiveCardServiceBase extends $grpc.Service {
  $core.String get $name => 'api.AdaptiveCardService';

  AdaptiveCardServiceBase() {
-    $addMethod($grpc.ServiceMethod<$0.GetAdaptiveCardRequest, $0.GetAdaptiveCardResult>(
+    $addMethod($grpc.ServiceMethod<$4.GetAdaptiveCardRequest, $4.GetAdaptiveCardResult>(
        'Get',
        get_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.GetAdaptiveCardRequest.fromBuffer(value),
-        ($0.GetAdaptiveCardResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.ListAdaptiveCardRequest, $0.ListAdaptiveCardResult>(
+        ($core.List<$core.int> value) => $4.GetAdaptiveCardRequest.fromBuffer(value),
+        ($4.GetAdaptiveCardResult value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$4.ListAdaptiveCardRequest, $4.ListAdaptiveCardResult>(
        'List',
        list_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.ListAdaptiveCardRequest.fromBuffer(value),
-        ($0.ListAdaptiveCardResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.CreateAdaptiveCardRequest, $0.CreateAdaptiveCardResult>(
+        ($core.List<$core.int> value) => $4.ListAdaptiveCardRequest.fromBuffer(value),
+        ($4.ListAdaptiveCardResult value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$4.CreateAdaptiveCardRequest, $4.CreateAdaptiveCardResult>(
        'Create',
        create_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.CreateAdaptiveCardRequest.fromBuffer(value),
-        ($0.CreateAdaptiveCardResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.UpdateAdaptiveCardRequest, $0.UpdateAdaptiveCardResult>(
+        ($core.List<$core.int> value) => $4.CreateAdaptiveCardRequest.fromBuffer(value),
+        ($4.CreateAdaptiveCardResult value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$4.UpdateAdaptiveCardRequest, $4.UpdateAdaptiveCardResult>(
        'Update',
        update_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.UpdateAdaptiveCardRequest.fromBuffer(value),
-        ($0.UpdateAdaptiveCardResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.DeleteAdaptiveCardRequest, $0.DeleteAdaptiveCardResult>(
+        ($core.List<$core.int> value) => $4.UpdateAdaptiveCardRequest.fromBuffer(value),
+        ($4.UpdateAdaptiveCardResult value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$4.DeleteAdaptiveCardRequest, $4.DeleteAdaptiveCardResult>(
        'Delete',
        delete_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.DeleteAdaptiveCardRequest.fromBuffer(value),
-        ($0.DeleteAdaptiveCardResult value) => value.writeToBuffer()));
+        ($core.List<$core.int> value) => $4.DeleteAdaptiveCardRequest.fromBuffer(value),
+        ($4.DeleteAdaptiveCardResult value) => value.writeToBuffer()));
  }

-  $async.Future<$0.GetAdaptiveCardResult> get_Pre($grpc.ServiceCall $call, $async.Future<$0.GetAdaptiveCardRequest> $request) async {
+  $async.Future<$4.GetAdaptiveCardResult> get_Pre($grpc.ServiceCall $call, $async.Future<$4.GetAdaptiveCardRequest> $request) async {
    return get($call, await $request);
  }

-  $async.Future<$0.GetAdaptiveCardResult> get($grpc.ServiceCall call, $0.GetAdaptiveCardRequest request);
-
-  $async.Future<$0.ListAdaptiveCardResult> list_Pre($grpc.ServiceCall $call, $async.Future<$0.ListAdaptiveCardRequest> $request) async {
+  $async.Future<$4.ListAdaptiveCardResult> list_Pre($grpc.ServiceCall $call, $async.Future<$4.ListAdaptiveCardRequest> $request) async {
    return list($call, await $request);
  }

-  $async.Future<$0.ListAdaptiveCardResult> list($grpc.ServiceCall call, $0.ListAdaptiveCardRequest request);
-
-  $async.Future<$0.CreateAdaptiveCardResult> create_Pre($grpc.ServiceCall $call, $async.Future<$0.CreateAdaptiveCardRequest> $request) async {
+  $async.Future<$4.CreateAdaptiveCardResult> create_Pre($grpc.ServiceCall $call, $async.Future<$4.CreateAdaptiveCardRequest> $request) async {
    return create($call, await $request);
  }

-  $async.Future<$0.CreateAdaptiveCardResult> create($grpc.ServiceCall call, $0.CreateAdaptiveCardRequest request);
-
-  $async.Future<$0.UpdateAdaptiveCardResult> update_Pre($grpc.ServiceCall $call, $async.Future<$0.UpdateAdaptiveCardRequest> $request) async {
+  $async.Future<$4.UpdateAdaptiveCardResult> update_Pre($grpc.ServiceCall $call, $async.Future<$4.UpdateAdaptiveCardRequest> $request) async {
    return update($call, await $request);
  }

-  $async.Future<$0.UpdateAdaptiveCardResult> update($grpc.ServiceCall call, $0.UpdateAdaptiveCardRequest request);
-
-  $async.Future<$0.DeleteAdaptiveCardResult> delete_Pre($grpc.ServiceCall $call, $async.Future<$0.DeleteAdaptiveCardRequest> $request) async {
+  $async.Future<$4.DeleteAdaptiveCardResult> delete_Pre($grpc.ServiceCall $call, $async.Future<$4.DeleteAdaptiveCardRequest> $request) async {
    return delete($call, await $request);
  }

-  $async.Future<$0.DeleteAdaptiveCardResult> delete($grpc.ServiceCall call, $0.DeleteAdaptiveCardRequest request);
-
+  $async.Future<$4.GetAdaptiveCardResult> get($grpc.ServiceCall call, $4.GetAdaptiveCardRequest request);
+  $async.Future<$4.ListAdaptiveCardResult> list($grpc.ServiceCall call, $4.ListAdaptiveCardRequest request);
+  $async.Future<$4.CreateAdaptiveCardResult> create($grpc.ServiceCall call, $4.CreateAdaptiveCardRequest request);
+  $async.Future<$4.UpdateAdaptiveCardResult> update($grpc.ServiceCall call, $4.UpdateAdaptiveCardRequest request);
+  $async.Future<$4.DeleteAdaptiveCardResult> delete($grpc.ServiceCall call, $4.DeleteAdaptiveCardRequest request);
 }
--- a/lib/adaptiveCard.pbjson.dart
+++ b/lib/adaptiveCard.pbjson.dart
@@ -1,14 +1,13 @@
-// This is a generated file - do not edit.
 //
-// Generated from adaptiveCard.proto.
-
+//  Generated code. Do not modify.
+//  source: adaptiveCard.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
--- a/lib/admin-actor.pb.dart
+++ b/lib/admin-actor.pb.dart
@@ -1,20 +1,20 @@
-// This is a generated file - do not edit.
 //
-// Generated from admin-actor.proto.
-
+//  Generated code. Do not modify.
+//  source: admin-actor.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:core' as $core;

 import 'package:protobuf/protobuf.dart' as $pb;

-import 'repositoryShared.pb.dart' as $0;
+import 'repositoryShared.pb.dart' as $65;
+import 'repositoryShared.pbenum.dart' as $65;

 export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;

@@ -24,51 +24,69 @@ class AdminActor extends $pb.GeneratedMessage {
    $core.String? name,
    $core.String? organisationID,
    $core.String? partnerID,
-    $0.Address? address,
-    $0.ActorContact? contact,
-    $0.ActorTypology? typology,
+    $65.Address? address,
+    $65.ActorContact? contact,
+    $65.ActorTypology? typology,
    $core.String? additionalInformation,
  }) {
-    final result = create();
-    if (iD != null) result.iD = iD;
-    if (name != null) result.name = name;
-    if (organisationID != null) result.organisationID = organisationID;
-    if (partnerID != null) result.partnerID = partnerID;
-    if (address != null) result.address = address;
-    if (contact != null) result.contact = contact;
-    if (typology != null) result.typology = typology;
-    if (additionalInformation != null) result.additionalInformation = additionalInformation;
-    return result;
+    final $result = create();
+    if (iD != null) {
+      $result.iD = iD;
+    }
+    if (name != null) {
+      $result.name = name;
+    }
+    if (organisationID != null) {
+      $result.organisationID = organisationID;
+    }
+    if (partnerID != null) {
+      $result.partnerID = partnerID;
+    }
+    if (address != null) {
+      $result.address = address;
+    }
+    if (contact != null) {
+      $result.contact = contact;
+    }
+    if (typology != null) {
+      $result.typology = typology;
+    }
+    if (additionalInformation != null) {
+      $result.additionalInformation = additionalInformation;
+    }
+    return $result;
  }
-
-  AdminActor._();
-
-  factory AdminActor.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory AdminActor.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  AdminActor._() : super();
+  factory AdminActor.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory AdminActor.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'AdminActor', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
    ..aOS(1, _omitFieldNames ? '' : 'ID', protoName: 'ID')
    ..aOS(2, _omitFieldNames ? '' : 'Name', protoName: 'Name')
    ..aOS(3, _omitFieldNames ? '' : 'OrganisationID', protoName: 'OrganisationID')
    ..aOS(4, _omitFieldNames ? '' : 'PartnerID', protoName: 'PartnerID')
-    ..aOM<$0.Address>(6, _omitFieldNames ? '' : 'Address', protoName: 'Address', subBuilder: $0.Address.create)
-    ..aOM<$0.ActorContact>(7, _omitFieldNames ? '' : 'Contact', protoName: 'Contact', subBuilder: $0.ActorContact.create)
-    ..e<$0.ActorTypology>(8, _omitFieldNames ? '' : 'Typology', $pb.PbFieldType.OE, protoName: 'Typology', defaultOrMaker: $0.ActorTypology.TYPOLOGY_UNKNOWN, valueOf: $0.ActorTypology.valueOf, enumValues: $0.ActorTypology.values)
+    ..aOM<$65.Address>(6, _omitFieldNames ? '' : 'Address', protoName: 'Address', subBuilder: $65.Address.create)
+    ..aOM<$65.ActorContact>(7, _omitFieldNames ? '' : 'Contact', protoName: 'Contact', subBuilder: $65.ActorContact.create)
+    ..e<$65.ActorTypology>(8, _omitFieldNames ? '' : 'Typology', $pb.PbFieldType.OE, protoName: 'Typology', defaultOrMaker: $65.ActorTypology.TYPOLOGY_UNKNOWN, valueOf: $65.ActorTypology.valueOf, enumValues: $65.ActorTypology.values)
    ..aOS(9, _omitFieldNames ? '' : 'AdditionalInformation', protoName: 'AdditionalInformation')
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  AdminActor clone() => AdminActor()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  AdminActor copyWith(void Function(AdminActor) updates) => super.copyWith((message) => updates(message as AdminActor)) as AdminActor;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static AdminActor create() => AdminActor._();
-  @$core.override
  AdminActor createEmptyInstance() => create();
  static $pb.PbList<AdminActor> createRepeated() => $pb.PbList<AdminActor>();
  @$core.pragma('dart2js:noInline')
@@ -78,7 +96,7 @@ class AdminActor extends $pb.GeneratedMessage {
  @$pb.TagNumber(1)
  $core.String get iD => $_getSZ(0);
  @$pb.TagNumber(1)
-  set iD($core.String value) => $_setString(0, value);
+  set iD($core.String v) { $_setString(0, v); }
  @$pb.TagNumber(1)
  $core.bool hasID() => $_has(0);
  @$pb.TagNumber(1)
@@ -87,7 +105,7 @@ class AdminActor extends $pb.GeneratedMessage {
  @$pb.TagNumber(2)
  $core.String get name => $_getSZ(1);
  @$pb.TagNumber(2)
-  set name($core.String value) => $_setString(1, value);
+  set name($core.String v) { $_setString(1, v); }
  @$pb.TagNumber(2)
  $core.bool hasName() => $_has(1);
  @$pb.TagNumber(2)
@@ -96,7 +114,7 @@ class AdminActor extends $pb.GeneratedMessage {
  @$pb.TagNumber(3)
  $core.String get organisationID => $_getSZ(2);
  @$pb.TagNumber(3)
-  set organisationID($core.String value) => $_setString(2, value);
+  set organisationID($core.String v) { $_setString(2, v); }
  @$pb.TagNumber(3)
  $core.bool hasOrganisationID() => $_has(2);
  @$pb.TagNumber(3)
@@ -105,38 +123,38 @@ class AdminActor extends $pb.GeneratedMessage {
  @$pb.TagNumber(4)
  $core.String get partnerID => $_getSZ(3);
  @$pb.TagNumber(4)
-  set partnerID($core.String value) => $_setString(3, value);
+  set partnerID($core.String v) { $_setString(3, v); }
  @$pb.TagNumber(4)
  $core.bool hasPartnerID() => $_has(3);
  @$pb.TagNumber(4)
  void clearPartnerID() => $_clearField(4);

  @$pb.TagNumber(6)
-  $0.Address get address => $_getN(4);
+  $65.Address get address => $_getN(4);
  @$pb.TagNumber(6)
-  set address($0.Address value) => $_setField(6, value);
+  set address($65.Address v) { $_setField(6, v); }
  @$pb.TagNumber(6)
  $core.bool hasAddress() => $_has(4);
  @$pb.TagNumber(6)
  void clearAddress() => $_clearField(6);
  @$pb.TagNumber(6)
-  $0.Address ensureAddress() => $_ensure(4);
+  $65.Address ensureAddress() => $_ensure(4);

  @$pb.TagNumber(7)
-  $0.ActorContact get contact => $_getN(5);
+  $65.ActorContact get contact => $_getN(5);
  @$pb.TagNumber(7)
-  set contact($0.ActorContact value) => $_setField(7, value);
+  set contact($65.ActorContact v) { $_setField(7, v); }
  @$pb.TagNumber(7)
  $core.bool hasContact() => $_has(5);
  @$pb.TagNumber(7)
  void clearContact() => $_clearField(7);
  @$pb.TagNumber(7)
-  $0.ActorContact ensureContact() => $_ensure(5);
+  $65.ActorContact ensureContact() => $_ensure(5);

  @$pb.TagNumber(8)
-  $0.ActorTypology get typology => $_getN(6);
+  $65.ActorTypology get typology => $_getN(6);
  @$pb.TagNumber(8)
-  set typology($0.ActorTypology value) => $_setField(8, value);
+  set typology($65.ActorTypology v) { $_setField(8, v); }
  @$pb.TagNumber(8)
  $core.bool hasTypology() => $_has(6);
  @$pb.TagNumber(8)
@@ -145,7 +163,7 @@ class AdminActor extends $pb.GeneratedMessage {
  @$pb.TagNumber(9)
  $core.String get additionalInformation => $_getSZ(7);
  @$pb.TagNumber(9)
-  set additionalInformation($core.String value) => $_setString(7, value);
+  set additionalInformation($core.String v) { $_setString(7, v); }
  @$pb.TagNumber(9)
  $core.bool hasAdditionalInformation() => $_has(7);
  @$pb.TagNumber(9)
@@ -153,5 +171,5 @@ class AdminActor extends $pb.GeneratedMessage {
 }


-const $core.bool _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
-const $core.bool _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
+const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
+const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
--- a/lib/admin-actor.pbenum.dart
+++ b/lib/admin-actor.pbenum.dart
@@ -1,12 +1,11 @@
-// This is a generated file - do not edit.
 //
-// Generated from admin-actor.proto.
-
+//  Generated code. Do not modify.
+//  source: admin-actor.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

--- a/lib/admin-actor.pbjson.dart
+++ b/lib/admin-actor.pbjson.dart
@@ -1,14 +1,13 @@
-// This is a generated file - do not edit.
 //
-// Generated from admin-actor.proto.
-
+//  Generated code. Do not modify.
+//  source: admin-actor.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
--- a/lib/admin-partner.pb.dart
+++ b/lib/admin-partner.pb.dart
@@ -1,21 +1,20 @@
-// This is a generated file - do not edit.
 //
-// Generated from admin-partner.proto.
-
+//  Generated code. Do not modify.
+//  source: admin-partner.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:core' as $core;

 import 'package:protobuf/protobuf.dart' as $pb;

-import 'admin-actor.pb.dart' as $1;
-import 'repositoryShared.pb.dart' as $0;
+import 'admin-actor.pb.dart' as $68;
+import 'repositoryShared.pb.dart' as $65;

 export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;

@@ -24,52 +23,70 @@ class AdminPartner extends $pb.GeneratedMessage {
    $core.String? iD,
    $core.String? name,
    $core.String? legalStructure,
-    $0.Address? address,
+    $65.Address? address,
    $core.String? organisationID,
    $core.Iterable<$core.String>? actorIDs,
-    $core.Iterable<$1.AdminActor>? actors,
+    $core.Iterable<$68.AdminActor>? actors,
    $core.String? photoURI,
  }) {
-    final result = create();
-    if (iD != null) result.iD = iD;
-    if (name != null) result.name = name;
-    if (legalStructure != null) result.legalStructure = legalStructure;
-    if (address != null) result.address = address;
-    if (organisationID != null) result.organisationID = organisationID;
-    if (actorIDs != null) result.actorIDs.addAll(actorIDs);
-    if (actors != null) result.actors.addAll(actors);
-    if (photoURI != null) result.photoURI = photoURI;
-    return result;
+    final $result = create();
+    if (iD != null) {
+      $result.iD = iD;
+    }
+    if (name != null) {
+      $result.name = name;
+    }
+    if (legalStructure != null) {
+      $result.legalStructure = legalStructure;
+    }
+    if (address != null) {
+      $result.address = address;
+    }
+    if (organisationID != null) {
+      $result.organisationID = organisationID;
+    }
+    if (actorIDs != null) {
+      $result.actorIDs.addAll(actorIDs);
+    }
+    if (actors != null) {
+      $result.actors.addAll(actors);
+    }
+    if (photoURI != null) {
+      $result.photoURI = photoURI;
+    }
+    return $result;
  }
-
-  AdminPartner._();
-
-  factory AdminPartner.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory AdminPartner.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  AdminPartner._() : super();
+  factory AdminPartner.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory AdminPartner.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'AdminPartner', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
    ..aOS(1, _omitFieldNames ? '' : 'ID', protoName: 'ID')
    ..aOS(2, _omitFieldNames ? '' : 'Name', protoName: 'Name')
    ..aOS(3, _omitFieldNames ? '' : 'LegalStructure', protoName: 'LegalStructure')
-    ..aOM<$0.Address>(4, _omitFieldNames ? '' : 'Address', protoName: 'Address', subBuilder: $0.Address.create)
+    ..aOM<$65.Address>(4, _omitFieldNames ? '' : 'Address', protoName: 'Address', subBuilder: $65.Address.create)
    ..aOS(5, _omitFieldNames ? '' : 'OrganisationID', protoName: 'OrganisationID')
    ..pPS(6, _omitFieldNames ? '' : 'ActorIDs', protoName: 'ActorIDs')
-    ..pc<$1.AdminActor>(7, _omitFieldNames ? '' : 'Actors', $pb.PbFieldType.PM, protoName: 'Actors', subBuilder: $1.AdminActor.create)
+    ..pc<$68.AdminActor>(7, _omitFieldNames ? '' : 'Actors', $pb.PbFieldType.PM, protoName: 'Actors', subBuilder: $68.AdminActor.create)
    ..aOS(8, _omitFieldNames ? '' : 'PhotoURI', protoName: 'PhotoURI')
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  AdminPartner clone() => AdminPartner()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  AdminPartner copyWith(void Function(AdminPartner) updates) => super.copyWith((message) => updates(message as AdminPartner)) as AdminPartner;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static AdminPartner create() => AdminPartner._();
-  @$core.override
  AdminPartner createEmptyInstance() => create();
  static $pb.PbList<AdminPartner> createRepeated() => $pb.PbList<AdminPartner>();
  @$core.pragma('dart2js:noInline')
@@ -79,7 +96,7 @@ class AdminPartner extends $pb.GeneratedMessage {
  @$pb.TagNumber(1)
  $core.String get iD => $_getSZ(0);
  @$pb.TagNumber(1)
-  set iD($core.String value) => $_setString(0, value);
+  set iD($core.String v) { $_setString(0, v); }
  @$pb.TagNumber(1)
  $core.bool hasID() => $_has(0);
  @$pb.TagNumber(1)
@@ -88,7 +105,7 @@ class AdminPartner extends $pb.GeneratedMessage {
  @$pb.TagNumber(2)
  $core.String get name => $_getSZ(1);
  @$pb.TagNumber(2)
-  set name($core.String value) => $_setString(1, value);
+  set name($core.String v) { $_setString(1, v); }
  @$pb.TagNumber(2)
  $core.bool hasName() => $_has(1);
  @$pb.TagNumber(2)
@@ -97,27 +114,27 @@ class AdminPartner extends $pb.GeneratedMessage {
  @$pb.TagNumber(3)
  $core.String get legalStructure => $_getSZ(2);
  @$pb.TagNumber(3)
-  set legalStructure($core.String value) => $_setString(2, value);
+  set legalStructure($core.String v) { $_setString(2, v); }
  @$pb.TagNumber(3)
  $core.bool hasLegalStructure() => $_has(2);
  @$pb.TagNumber(3)
  void clearLegalStructure() => $_clearField(3);

  @$pb.TagNumber(4)
-  $0.Address get address => $_getN(3);
+  $65.Address get address => $_getN(3);
  @$pb.TagNumber(4)
-  set address($0.Address value) => $_setField(4, value);
+  set address($65.Address v) { $_setField(4, v); }
  @$pb.TagNumber(4)
  $core.bool hasAddress() => $_has(3);
  @$pb.TagNumber(4)
  void clearAddress() => $_clearField(4);
  @$pb.TagNumber(4)
-  $0.Address ensureAddress() => $_ensure(3);
+  $65.Address ensureAddress() => $_ensure(3);

  @$pb.TagNumber(5)
  $core.String get organisationID => $_getSZ(4);
  @$pb.TagNumber(5)
-  set organisationID($core.String value) => $_setString(4, value);
+  set organisationID($core.String v) { $_setString(4, v); }
  @$pb.TagNumber(5)
  $core.bool hasOrganisationID() => $_has(4);
  @$pb.TagNumber(5)
@@ -129,12 +146,12 @@ class AdminPartner extends $pb.GeneratedMessage {

  /// In not accepted / Out Actors are returned
  @$pb.TagNumber(7)
-  $pb.PbList<$1.AdminActor> get actors => $_getList(6);
+  $pb.PbList<$68.AdminActor> get actors => $_getList(6);

  @$pb.TagNumber(8)
  $core.String get photoURI => $_getSZ(7);
  @$pb.TagNumber(8)
-  set photoURI($core.String value) => $_setString(7, value);
+  set photoURI($core.String v) { $_setString(7, v); }
  @$pb.TagNumber(8)
  $core.bool hasPhotoURI() => $_has(7);
  @$pb.TagNumber(8)
@@ -142,5 +159,5 @@ class AdminPartner extends $pb.GeneratedMessage {
 }


-const $core.bool _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
-const $core.bool _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
+const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
+const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
--- a/lib/admin-partner.pbenum.dart
+++ b/lib/admin-partner.pbenum.dart
@@ -1,12 +1,11 @@
-// This is a generated file - do not edit.
 //
-// Generated from admin-partner.proto.
-
+//  Generated code. Do not modify.
+//  source: admin-partner.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

--- a/lib/admin-partner.pbjson.dart
+++ b/lib/admin-partner.pbjson.dart
@@ -1,14 +1,13 @@
-// This is a generated file - do not edit.
 //
-// Generated from admin-partner.proto.
-
+//  Generated code. Do not modify.
+//  source: admin-partner.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
--- a/lib/adminConnection.pb.dart
+++ b/lib/adminConnection.pb.dart
@@ -1,20 +1,19 @@
-// This is a generated file - do not edit.
 //
-// Generated from adminConnection.proto.
-
+//  Generated code. Do not modify.
+//  source: adminConnection.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:core' as $core;

 import 'package:protobuf/protobuf.dart' as $pb;

-import 'shared.pb.dart' as $1;
+import 'shared.pb.dart' as $3;

 export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;

@@ -24,17 +23,21 @@ class AdminConnection extends $pb.GeneratedMessage {
    $core.String? uriStartApi,
    $core.Iterable<ArgElement>? argsUriStart,
  }) {
-    final result = create();
-    if (iD != null) result.iD = iD;
-    if (uriStartApi != null) result.uriStartApi = uriStartApi;
-    if (argsUriStart != null) result.argsUriStart.addAll(argsUriStart);
-    return result;
+    final $result = create();
+    if (iD != null) {
+      $result.iD = iD;
+    }
+    if (uriStartApi != null) {
+      $result.uriStartApi = uriStartApi;
+    }
+    if (argsUriStart != null) {
+      $result.argsUriStart.addAll(argsUriStart);
+    }
+    return $result;
  }
-
-  AdminConnection._();
-
-  factory AdminConnection.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory AdminConnection.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  AdminConnection._() : super();
+  factory AdminConnection.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory AdminConnection.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'AdminConnection', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
    ..aOS(1, _omitFieldNames ? '' : 'ID', protoName: 'ID')
@@ -43,17 +46,21 @@ class AdminConnection extends $pb.GeneratedMessage {
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  AdminConnection clone() => AdminConnection()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  AdminConnection copyWith(void Function(AdminConnection) updates) => super.copyWith((message) => updates(message as AdminConnection)) as AdminConnection;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static AdminConnection create() => AdminConnection._();
-  @$core.override
  AdminConnection createEmptyInstance() => create();
  static $pb.PbList<AdminConnection> createRepeated() => $pb.PbList<AdminConnection>();
  @$core.pragma('dart2js:noInline')
@@ -63,7 +70,7 @@ class AdminConnection extends $pb.GeneratedMessage {
  @$pb.TagNumber(1)
  $core.String get iD => $_getSZ(0);
  @$pb.TagNumber(1)
-  set iD($core.String value) => $_setString(0, value);
+  set iD($core.String v) { $_setString(0, v); }
  @$pb.TagNumber(1)
  $core.bool hasID() => $_has(0);
  @$pb.TagNumber(1)
@@ -72,7 +79,7 @@ class AdminConnection extends $pb.GeneratedMessage {
  @$pb.TagNumber(2)
  $core.String get uriStartApi => $_getSZ(1);
  @$pb.TagNumber(2)
-  set uriStartApi($core.String value) => $_setString(1, value);
+  set uriStartApi($core.String v) { $_setString(1, v); }
  @$pb.TagNumber(2)
  $core.bool hasUriStartApi() => $_has(1);
  @$pb.TagNumber(2)
@@ -85,36 +92,42 @@ class AdminConnection extends $pb.GeneratedMessage {
 class ArgElement extends $pb.GeneratedMessage {
  factory ArgElement({
    $core.String? key,
-    $1.ValueType? value,
+    $3.ValueType? value,
  }) {
-    final result = create();
-    if (key != null) result.key = key;
-    if (value != null) result.value = value;
-    return result;
+    final $result = create();
+    if (key != null) {
+      $result.key = key;
+    }
+    if (value != null) {
+      $result.value = value;
+    }
+    return $result;
  }
-
-  ArgElement._();
-
-  factory ArgElement.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory ArgElement.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  ArgElement._() : super();
+  factory ArgElement.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory ArgElement.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ArgElement', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
    ..aOS(1, _omitFieldNames ? '' : 'Key', protoName: 'Key')
-    ..aOM<$1.ValueType>(2, _omitFieldNames ? '' : 'Value', protoName: 'Value', subBuilder: $1.ValueType.create)
+    ..aOM<$3.ValueType>(2, _omitFieldNames ? '' : 'Value', protoName: 'Value', subBuilder: $3.ValueType.create)
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  ArgElement clone() => ArgElement()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  ArgElement copyWith(void Function(ArgElement) updates) => super.copyWith((message) => updates(message as ArgElement)) as ArgElement;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static ArgElement create() => ArgElement._();
-  @$core.override
  ArgElement createEmptyInstance() => create();
  static $pb.PbList<ArgElement> createRepeated() => $pb.PbList<ArgElement>();
  @$core.pragma('dart2js:noInline')
@@ -124,22 +137,22 @@ class ArgElement extends $pb.GeneratedMessage {
  @$pb.TagNumber(1)
  $core.String get key => $_getSZ(0);
  @$pb.TagNumber(1)
-  set key($core.String value) => $_setString(0, value);
+  set key($core.String v) { $_setString(0, v); }
  @$pb.TagNumber(1)
  $core.bool hasKey() => $_has(0);
  @$pb.TagNumber(1)
  void clearKey() => $_clearField(1);

  @$pb.TagNumber(2)
-  $1.ValueType get value => $_getN(1);
+  $3.ValueType get value => $_getN(1);
  @$pb.TagNumber(2)
-  set value($1.ValueType value) => $_setField(2, value);
+  set value($3.ValueType v) { $_setField(2, v); }
  @$pb.TagNumber(2)
  $core.bool hasValue() => $_has(1);
  @$pb.TagNumber(2)
  void clearValue() => $_clearField(2);
  @$pb.TagNumber(2)
-  $1.ValueType ensureValue() => $_ensure(1);
+  $3.ValueType ensureValue() => $_ensure(1);
 }

 class RegisterConnectionManagerRequest extends $pb.GeneratedMessage {
@@ -148,17 +161,21 @@ class RegisterConnectionManagerRequest extends $pb.GeneratedMessage {
    $core.String? uriStartApi,
    $core.Iterable<ArgElement>? argsUriStart,
  }) {
-    final result = create();
-    if (iD != null) result.iD = iD;
-    if (uriStartApi != null) result.uriStartApi = uriStartApi;
-    if (argsUriStart != null) result.argsUriStart.addAll(argsUriStart);
-    return result;
+    final $result = create();
+    if (iD != null) {
+      $result.iD = iD;
+    }
+    if (uriStartApi != null) {
+      $result.uriStartApi = uriStartApi;
+    }
+    if (argsUriStart != null) {
+      $result.argsUriStart.addAll(argsUriStart);
+    }
+    return $result;
  }
-
-  RegisterConnectionManagerRequest._();
-
-  factory RegisterConnectionManagerRequest.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory RegisterConnectionManagerRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  RegisterConnectionManagerRequest._() : super();
+  factory RegisterConnectionManagerRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory RegisterConnectionManagerRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'RegisterConnectionManagerRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
    ..aOS(1, _omitFieldNames ? '' : 'ID', protoName: 'ID')
@@ -167,17 +184,21 @@ class RegisterConnectionManagerRequest extends $pb.GeneratedMessage {
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  RegisterConnectionManagerRequest clone() => RegisterConnectionManagerRequest()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  RegisterConnectionManagerRequest copyWith(void Function(RegisterConnectionManagerRequest) updates) => super.copyWith((message) => updates(message as RegisterConnectionManagerRequest)) as RegisterConnectionManagerRequest;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static RegisterConnectionManagerRequest create() => RegisterConnectionManagerRequest._();
-  @$core.override
  RegisterConnectionManagerRequest createEmptyInstance() => create();
  static $pb.PbList<RegisterConnectionManagerRequest> createRepeated() => $pb.PbList<RegisterConnectionManagerRequest>();
  @$core.pragma('dart2js:noInline')
@@ -187,7 +208,7 @@ class RegisterConnectionManagerRequest extends $pb.GeneratedMessage {
  @$pb.TagNumber(1)
  $core.String get iD => $_getSZ(0);
  @$pb.TagNumber(1)
-  set iD($core.String value) => $_setString(0, value);
+  set iD($core.String v) { $_setString(0, v); }
  @$pb.TagNumber(1)
  $core.bool hasID() => $_has(0);
  @$pb.TagNumber(1)
@@ -196,7 +217,7 @@ class RegisterConnectionManagerRequest extends $pb.GeneratedMessage {
  @$pb.TagNumber(2)
  $core.String get uriStartApi => $_getSZ(1);
  @$pb.TagNumber(2)
-  set uriStartApi($core.String value) => $_setString(1, value);
+  set uriStartApi($core.String v) { $_setString(1, v); }
  @$pb.TagNumber(2)
  $core.bool hasUriStartApi() => $_has(1);
  @$pb.TagNumber(2)
@@ -208,27 +229,29 @@ class RegisterConnectionManagerRequest extends $pb.GeneratedMessage {

 class RegisterConnectionManagerResult extends $pb.GeneratedMessage {
  factory RegisterConnectionManagerResult() => create();
-
-  RegisterConnectionManagerResult._();
-
-  factory RegisterConnectionManagerResult.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory RegisterConnectionManagerResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  RegisterConnectionManagerResult._() : super();
+  factory RegisterConnectionManagerResult.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory RegisterConnectionManagerResult.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'RegisterConnectionManagerResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  RegisterConnectionManagerResult clone() => RegisterConnectionManagerResult()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  RegisterConnectionManagerResult copyWith(void Function(RegisterConnectionManagerResult) updates) => super.copyWith((message) => updates(message as RegisterConnectionManagerResult)) as RegisterConnectionManagerResult;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static RegisterConnectionManagerResult create() => RegisterConnectionManagerResult._();
-  @$core.override
  RegisterConnectionManagerResult createEmptyInstance() => create();
  static $pb.PbList<RegisterConnectionManagerResult> createRepeated() => $pb.PbList<RegisterConnectionManagerResult>();
  @$core.pragma('dart2js:noInline')
@@ -238,27 +261,29 @@ class RegisterConnectionManagerResult extends $pb.GeneratedMessage {

 class ListConnectionManagerRequest extends $pb.GeneratedMessage {
  factory ListConnectionManagerRequest() => create();
-
-  ListConnectionManagerRequest._();
-
-  factory ListConnectionManagerRequest.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory ListConnectionManagerRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  ListConnectionManagerRequest._() : super();
+  factory ListConnectionManagerRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory ListConnectionManagerRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ListConnectionManagerRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  ListConnectionManagerRequest clone() => ListConnectionManagerRequest()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  ListConnectionManagerRequest copyWith(void Function(ListConnectionManagerRequest) updates) => super.copyWith((message) => updates(message as ListConnectionManagerRequest)) as ListConnectionManagerRequest;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static ListConnectionManagerRequest create() => ListConnectionManagerRequest._();
-  @$core.override
  ListConnectionManagerRequest createEmptyInstance() => create();
  static $pb.PbList<ListConnectionManagerRequest> createRepeated() => $pb.PbList<ListConnectionManagerRequest>();
  @$core.pragma('dart2js:noInline')
@@ -270,32 +295,36 @@ class ListConnectionManagerResult extends $pb.GeneratedMessage {
  factory ListConnectionManagerResult({
    $core.Iterable<AdminConnection>? results,
  }) {
-    final result = create();
-    if (results != null) result.results.addAll(results);
-    return result;
+    final $result = create();
+    if (results != null) {
+      $result.results.addAll(results);
+    }
+    return $result;
  }
-
-  ListConnectionManagerResult._();
-
-  factory ListConnectionManagerResult.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory ListConnectionManagerResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  ListConnectionManagerResult._() : super();
+  factory ListConnectionManagerResult.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory ListConnectionManagerResult.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ListConnectionManagerResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
    ..pc<AdminConnection>(1, _omitFieldNames ? '' : 'Results', $pb.PbFieldType.PM, protoName: 'Results', subBuilder: AdminConnection.create)
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  ListConnectionManagerResult clone() => ListConnectionManagerResult()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  ListConnectionManagerResult copyWith(void Function(ListConnectionManagerResult) updates) => super.copyWith((message) => updates(message as ListConnectionManagerResult)) as ListConnectionManagerResult;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static ListConnectionManagerResult create() => ListConnectionManagerResult._();
-  @$core.override
  ListConnectionManagerResult createEmptyInstance() => create();
  static $pb.PbList<ListConnectionManagerResult> createRepeated() => $pb.PbList<ListConnectionManagerResult>();
  @$core.pragma('dart2js:noInline')
@@ -307,5 +336,5 @@ class ListConnectionManagerResult extends $pb.GeneratedMessage {
 }


-const $core.bool _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
-const $core.bool _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
+const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
+const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
--- a/lib/adminConnection.pbenum.dart
+++ b/lib/adminConnection.pbenum.dart
@@ -1,12 +1,11 @@
-// This is a generated file - do not edit.
 //
-// Generated from adminConnection.proto.
-
+//  Generated code. Do not modify.
+//  source: adminConnection.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

--- a/lib/adminConnection.pbgrpc.dart
+++ b/lib/adminConnection.pbgrpc.dart
@@ -1,14 +1,13 @@
-// This is a generated file - do not edit.
 //
-// Generated from adminConnection.proto.
-
+//  Generated code. Do not modify.
+//  source: adminConnection.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:async' as $async;
 import 'dart:core' as $core;
@@ -16,40 +15,30 @@ import 'dart:core' as $core;
 import 'package:grpc/service_api.dart' as $grpc;
 import 'package:protobuf/protobuf.dart' as $pb;

-import 'adminConnection.pb.dart' as $0;
+import 'adminConnection.pb.dart' as $5;

 export 'adminConnection.pb.dart';

@$pb.GrpcServiceName('api.AdminConnectionService')
 class AdminConnectionServiceClient extends $grpc.Client {
-  /// The hostname for this service.
-  static const $core.String defaultHost = '';
-
-  /// OAuth scopes needed for the client.
-  static const $core.List<$core.String> oauthScopes = [
-    '',
-  ];
+  static final _$registerConnectionManager = $grpc.ClientMethod<$5.RegisterConnectionManagerRequest, $5.RegisterConnectionManagerResult>(
+      '/api.AdminConnectionService/RegisterConnectionManager',
+      ($5.RegisterConnectionManagerRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $5.RegisterConnectionManagerResult.fromBuffer(value));
+  static final _$listConnectionManager = $grpc.ClientMethod<$5.ListConnectionManagerRequest, $5.ListConnectionManagerResult>(
+      '/api.AdminConnectionService/ListConnectionManager',
+      ($5.ListConnectionManagerRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $5.ListConnectionManagerResult.fromBuffer(value));

  AdminConnectionServiceClient(super.channel, {super.options, super.interceptors});

-  $grpc.ResponseFuture<$0.RegisterConnectionManagerResult> registerConnectionManager($0.RegisterConnectionManagerRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$5.RegisterConnectionManagerResult> registerConnectionManager($5.RegisterConnectionManagerRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$registerConnectionManager, request, options: options);
  }

-  $grpc.ResponseFuture<$0.ListConnectionManagerResult> listConnectionManager($0.ListConnectionManagerRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$5.ListConnectionManagerResult> listConnectionManager($5.ListConnectionManagerRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$listConnectionManager, request, options: options);
  }
-
-    // method descriptors
-
-  static final _$registerConnectionManager = $grpc.ClientMethod<$0.RegisterConnectionManagerRequest, $0.RegisterConnectionManagerResult>(
-      '/api.AdminConnectionService/RegisterConnectionManager',
-      ($0.RegisterConnectionManagerRequest value) => value.writeToBuffer(),
-      $0.RegisterConnectionManagerResult.fromBuffer);
-  static final _$listConnectionManager = $grpc.ClientMethod<$0.ListConnectionManagerRequest, $0.ListConnectionManagerResult>(
-      '/api.AdminConnectionService/ListConnectionManager',
-      ($0.ListConnectionManagerRequest value) => value.writeToBuffer(),
-      $0.ListConnectionManagerResult.fromBuffer);
 }

@$pb.GrpcServiceName('api.AdminConnectionService')
@@ -57,32 +46,30 @@ abstract class AdminConnectionServiceBase extends $grpc.Service {
  $core.String get $name => 'api.AdminConnectionService';

  AdminConnectionServiceBase() {
-    $addMethod($grpc.ServiceMethod<$0.RegisterConnectionManagerRequest, $0.RegisterConnectionManagerResult>(
+    $addMethod($grpc.ServiceMethod<$5.RegisterConnectionManagerRequest, $5.RegisterConnectionManagerResult>(
        'RegisterConnectionManager',
        registerConnectionManager_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.RegisterConnectionManagerRequest.fromBuffer(value),
-        ($0.RegisterConnectionManagerResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.ListConnectionManagerRequest, $0.ListConnectionManagerResult>(
+        ($core.List<$core.int> value) => $5.RegisterConnectionManagerRequest.fromBuffer(value),
+        ($5.RegisterConnectionManagerResult value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$5.ListConnectionManagerRequest, $5.ListConnectionManagerResult>(
        'ListConnectionManager',
        listConnectionManager_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.ListConnectionManagerRequest.fromBuffer(value),
-        ($0.ListConnectionManagerResult value) => value.writeToBuffer()));
+        ($core.List<$core.int> value) => $5.ListConnectionManagerRequest.fromBuffer(value),
+        ($5.ListConnectionManagerResult value) => value.writeToBuffer()));
  }

-  $async.Future<$0.RegisterConnectionManagerResult> registerConnectionManager_Pre($grpc.ServiceCall $call, $async.Future<$0.RegisterConnectionManagerRequest> $request) async {
+  $async.Future<$5.RegisterConnectionManagerResult> registerConnectionManager_Pre($grpc.ServiceCall $call, $async.Future<$5.RegisterConnectionManagerRequest> $request) async {
    return registerConnectionManager($call, await $request);
  }

-  $async.Future<$0.RegisterConnectionManagerResult> registerConnectionManager($grpc.ServiceCall call, $0.RegisterConnectionManagerRequest request);
-
-  $async.Future<$0.ListConnectionManagerResult> listConnectionManager_Pre($grpc.ServiceCall $call, $async.Future<$0.ListConnectionManagerRequest> $request) async {
+  $async.Future<$5.ListConnectionManagerResult> listConnectionManager_Pre($grpc.ServiceCall $call, $async.Future<$5.ListConnectionManagerRequest> $request) async {
    return listConnectionManager($call, await $request);
  }

-  $async.Future<$0.ListConnectionManagerResult> listConnectionManager($grpc.ServiceCall call, $0.ListConnectionManagerRequest request);
-
+  $async.Future<$5.RegisterConnectionManagerResult> registerConnectionManager($grpc.ServiceCall call, $5.RegisterConnectionManagerRequest request);
+  $async.Future<$5.ListConnectionManagerResult> listConnectionManager($grpc.ServiceCall call, $5.ListConnectionManagerRequest request);
 }
--- a/lib/adminConnection.pbjson.dart
+++ b/lib/adminConnection.pbjson.dart
@@ -1,14 +1,13 @@
-// This is a generated file - do not edit.
 //
-// Generated from adminConnection.proto.
-
+//  Generated code. Do not modify.
+//  source: adminConnection.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
--- a/lib/annotations.pb.dart
+++ b/lib/annotations.pb.dart
@@ -1,29 +1,28 @@
-// This is a generated file - do not edit.
 //
-// Generated from annotations.proto.
-
+//  Generated code. Do not modify.
+//  source: annotations.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:core' as $core;

 import 'package:protobuf/protobuf.dart' as $pb;

-import 'openapiv2.pb.dart' as $0;
+import 'openapiv2.pb.dart' as $69;

 export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;

 class Annotations {
-  static final openapiv2Swagger = $pb.Extension<$0.Swagger>(_omitMessageNames ? '' : 'google.protobuf.FileOptions', _omitFieldNames ? '' : 'openapiv2Swagger', 1042, $pb.PbFieldType.OM, defaultOrMaker: $0.Swagger.getDefault, subBuilder: $0.Swagger.create);
-  static final openapiv2Operation = $pb.Extension<$0.Operation>(_omitMessageNames ? '' : 'google.protobuf.MethodOptions', _omitFieldNames ? '' : 'openapiv2Operation', 1042, $pb.PbFieldType.OM, defaultOrMaker: $0.Operation.getDefault, subBuilder: $0.Operation.create);
-  static final openapiv2Schema = $pb.Extension<$0.Schema>(_omitMessageNames ? '' : 'google.protobuf.MessageOptions', _omitFieldNames ? '' : 'openapiv2Schema', 1042, $pb.PbFieldType.OM, defaultOrMaker: $0.Schema.getDefault, subBuilder: $0.Schema.create);
-  static final openapiv2Tag = $pb.Extension<$0.Tag>(_omitMessageNames ? '' : 'google.protobuf.ServiceOptions', _omitFieldNames ? '' : 'openapiv2Tag', 1042, $pb.PbFieldType.OM, defaultOrMaker: $0.Tag.getDefault, subBuilder: $0.Tag.create);
-  static final openapiv2Field = $pb.Extension<$0.JSONSchema>(_omitMessageNames ? '' : 'google.protobuf.FieldOptions', _omitFieldNames ? '' : 'openapiv2Field', 1042, $pb.PbFieldType.OM, defaultOrMaker: $0.JSONSchema.getDefault, subBuilder: $0.JSONSchema.create);
+  static final openapiv2Swagger = $pb.Extension<$69.Swagger>(_omitMessageNames ? '' : 'google.protobuf.FileOptions', _omitFieldNames ? '' : 'openapiv2Swagger', 1042, $pb.PbFieldType.OM, defaultOrMaker: $69.Swagger.getDefault, subBuilder: $69.Swagger.create);
+  static final openapiv2Operation = $pb.Extension<$69.Operation>(_omitMessageNames ? '' : 'google.protobuf.MethodOptions', _omitFieldNames ? '' : 'openapiv2Operation', 1042, $pb.PbFieldType.OM, defaultOrMaker: $69.Operation.getDefault, subBuilder: $69.Operation.create);
+  static final openapiv2Schema = $pb.Extension<$69.Schema>(_omitMessageNames ? '' : 'google.protobuf.MessageOptions', _omitFieldNames ? '' : 'openapiv2Schema', 1042, $pb.PbFieldType.OM, defaultOrMaker: $69.Schema.getDefault, subBuilder: $69.Schema.create);
+  static final openapiv2Tag = $pb.Extension<$69.Tag>(_omitMessageNames ? '' : 'google.protobuf.ServiceOptions', _omitFieldNames ? '' : 'openapiv2Tag', 1042, $pb.PbFieldType.OM, defaultOrMaker: $69.Tag.getDefault, subBuilder: $69.Tag.create);
+  static final openapiv2Field = $pb.Extension<$69.JSONSchema>(_omitMessageNames ? '' : 'google.protobuf.FieldOptions', _omitFieldNames ? '' : 'openapiv2Field', 1042, $pb.PbFieldType.OM, defaultOrMaker: $69.JSONSchema.getDefault, subBuilder: $69.JSONSchema.create);
  static void registerAllExtensions($pb.ExtensionRegistry registry) {
    registry.add(openapiv2Swagger);
    registry.add(openapiv2Operation);
@@ -34,5 +33,5 @@ class Annotations {
 }


-const $core.bool _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
-const $core.bool _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
+const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
+const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
--- a/lib/annotations.pbenum.dart
+++ b/lib/annotations.pbenum.dart
@@ -1,12 +1,11 @@
-// This is a generated file - do not edit.
 //
-// Generated from annotations.proto.
-
+//  Generated code. Do not modify.
+//  source: annotations.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

--- a/lib/annotations.pbjson.dart
+++ b/lib/annotations.pbjson.dart
@@ -1,14 +1,13 @@
-// This is a generated file - do not edit.
 //
-// Generated from annotations.proto.
-
+//  Generated code. Do not modify.
+//  source: annotations.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
--- a/lib/api.pb.dart
+++ b/lib/api.pb.dart
@@ -1,61 +1,69 @@
-// This is a generated file - do not edit.
 //
-// Generated from api.proto.
-
+//  Generated code. Do not modify.
+//  source: api.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:core' as $core;

 import 'package:protobuf/protobuf.dart' as $pb;

-import 'module.pb.dart' as $3;
-import 'role.pb.dart' as $2;
-import 'shared.pb.dart' as $1;
+import 'module.pb.dart' as $34;
+import 'role.pb.dart' as $52;
+import 'shared.pb.dart' as $3;
+import 'shared.pbenum.dart' as $3;

 export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;

 class GetPermissionsRequest extends $pb.GeneratedMessage {
  factory GetPermissionsRequest({
-    $1.ResourceType? rscType,
+    $3.ResourceType? rscType,
    $core.String? client,
    $core.String? service,
  }) {
-    final result = create();
-    if (rscType != null) result.rscType = rscType;
-    if (client != null) result.client = client;
-    if (service != null) result.service = service;
-    return result;
+    final $result = create();
+    if (rscType != null) {
+      $result.rscType = rscType;
+    }
+    if (client != null) {
+      $result.client = client;
+    }
+    if (service != null) {
+      $result.service = service;
+    }
+    return $result;
  }
-
-  GetPermissionsRequest._();
-
-  factory GetPermissionsRequest.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory GetPermissionsRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  GetPermissionsRequest._() : super();
+  factory GetPermissionsRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory GetPermissionsRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetPermissionsRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..e<$1.ResourceType>(1, _omitFieldNames ? '' : 'RscType', $pb.PbFieldType.OE, protoName: 'RscType', defaultOrMaker: $1.ResourceType.RESOURCE_TYPE_UNKNOWN, valueOf: $1.ResourceType.valueOf, enumValues: $1.ResourceType.values)
+    ..e<$3.ResourceType>(1, _omitFieldNames ? '' : 'RscType', $pb.PbFieldType.OE, protoName: 'RscType', defaultOrMaker: $3.ResourceType.RESOURCE_TYPE_UNKNOWN, valueOf: $3.ResourceType.valueOf, enumValues: $3.ResourceType.values)
    ..aOS(2, _omitFieldNames ? '' : 'Client', protoName: 'Client')
    ..aOS(3, _omitFieldNames ? '' : 'Service', protoName: 'Service')
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  GetPermissionsRequest clone() => GetPermissionsRequest()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  GetPermissionsRequest copyWith(void Function(GetPermissionsRequest) updates) => super.copyWith((message) => updates(message as GetPermissionsRequest)) as GetPermissionsRequest;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static GetPermissionsRequest create() => GetPermissionsRequest._();
-  @$core.override
  GetPermissionsRequest createEmptyInstance() => create();
  static $pb.PbList<GetPermissionsRequest> createRepeated() => $pb.PbList<GetPermissionsRequest>();
  @$core.pragma('dart2js:noInline')
@@ -63,9 +71,9 @@ class GetPermissionsRequest extends $pb.GeneratedMessage {
  static GetPermissionsRequest? _defaultInstance;

  @$pb.TagNumber(1)
-  $1.ResourceType get rscType => $_getN(0);
+  $3.ResourceType get rscType => $_getN(0);
  @$pb.TagNumber(1)
-  set rscType($1.ResourceType value) => $_setField(1, value);
+  set rscType($3.ResourceType v) { $_setField(1, v); }
  @$pb.TagNumber(1)
  $core.bool hasRscType() => $_has(0);
  @$pb.TagNumber(1)
@@ -74,7 +82,7 @@ class GetPermissionsRequest extends $pb.GeneratedMessage {
  @$pb.TagNumber(2)
  $core.String get client => $_getSZ(1);
  @$pb.TagNumber(2)
-  set client($core.String value) => $_setString(1, value);
+  set client($core.String v) { $_setString(1, v); }
  @$pb.TagNumber(2)
  $core.bool hasClient() => $_has(1);
  @$pb.TagNumber(2)
@@ -83,7 +91,7 @@ class GetPermissionsRequest extends $pb.GeneratedMessage {
  @$pb.TagNumber(3)
  $core.String get service => $_getSZ(2);
  @$pb.TagNumber(3)
-  set service($core.String value) => $_setString(2, value);
+  set service($core.String v) { $_setString(2, v); }
  @$pb.TagNumber(3)
  $core.bool hasService() => $_has(2);
  @$pb.TagNumber(3)
@@ -92,34 +100,38 @@ class GetPermissionsRequest extends $pb.GeneratedMessage {

 class GetPermissionsResult extends $pb.GeneratedMessage {
  factory GetPermissionsResult({
-    $core.Iterable<$1.Permission>? permissions,
+    $core.Iterable<$3.Permission>? permissions,
  }) {
-    final result = create();
-    if (permissions != null) result.permissions.addAll(permissions);
-    return result;
+    final $result = create();
+    if (permissions != null) {
+      $result.permissions.addAll(permissions);
+    }
+    return $result;
  }
-
-  GetPermissionsResult._();
-
-  factory GetPermissionsResult.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory GetPermissionsResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  GetPermissionsResult._() : super();
+  factory GetPermissionsResult.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory GetPermissionsResult.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetPermissionsResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..pc<$1.Permission>(5, _omitFieldNames ? '' : 'Permissions', $pb.PbFieldType.PM, protoName: 'Permissions', subBuilder: $1.Permission.create)
+    ..pc<$3.Permission>(5, _omitFieldNames ? '' : 'Permissions', $pb.PbFieldType.PM, protoName: 'Permissions', subBuilder: $3.Permission.create)
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  GetPermissionsResult clone() => GetPermissionsResult()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  GetPermissionsResult copyWith(void Function(GetPermissionsResult) updates) => super.copyWith((message) => updates(message as GetPermissionsResult)) as GetPermissionsResult;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static GetPermissionsResult create() => GetPermissionsResult._();
-  @$core.override
  GetPermissionsResult createEmptyInstance() => create();
  static $pb.PbList<GetPermissionsResult> createRepeated() => $pb.PbList<GetPermissionsResult>();
  @$core.pragma('dart2js:noInline')
@@ -127,45 +139,53 @@ class GetPermissionsResult extends $pb.GeneratedMessage {
  static GetPermissionsResult? _defaultInstance;

  @$pb.TagNumber(5)
-  $pb.PbList<$1.Permission> get permissions => $_getList(0);
+  $pb.PbList<$3.Permission> get permissions => $_getList(0);
 }

 class GetUIPermissionsRequest extends $pb.GeneratedMessage {
  factory GetUIPermissionsRequest({
-    $1.ResourceType? rscType,
+    $3.ResourceType? rscType,
    $core.String? client,
    $core.String? service,
  }) {
-    final result = create();
-    if (rscType != null) result.rscType = rscType;
-    if (client != null) result.client = client;
-    if (service != null) result.service = service;
-    return result;
+    final $result = create();
+    if (rscType != null) {
+      $result.rscType = rscType;
+    }
+    if (client != null) {
+      $result.client = client;
+    }
+    if (service != null) {
+      $result.service = service;
+    }
+    return $result;
  }
-
-  GetUIPermissionsRequest._();
-
-  factory GetUIPermissionsRequest.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory GetUIPermissionsRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  GetUIPermissionsRequest._() : super();
+  factory GetUIPermissionsRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory GetUIPermissionsRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetUIPermissionsRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..e<$1.ResourceType>(1, _omitFieldNames ? '' : 'RscType', $pb.PbFieldType.OE, protoName: 'RscType', defaultOrMaker: $1.ResourceType.RESOURCE_TYPE_UNKNOWN, valueOf: $1.ResourceType.valueOf, enumValues: $1.ResourceType.values)
+    ..e<$3.ResourceType>(1, _omitFieldNames ? '' : 'RscType', $pb.PbFieldType.OE, protoName: 'RscType', defaultOrMaker: $3.ResourceType.RESOURCE_TYPE_UNKNOWN, valueOf: $3.ResourceType.valueOf, enumValues: $3.ResourceType.values)
    ..aOS(2, _omitFieldNames ? '' : 'Client', protoName: 'Client')
    ..aOS(3, _omitFieldNames ? '' : 'Service', protoName: 'Service')
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  GetUIPermissionsRequest clone() => GetUIPermissionsRequest()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  GetUIPermissionsRequest copyWith(void Function(GetUIPermissionsRequest) updates) => super.copyWith((message) => updates(message as GetUIPermissionsRequest)) as GetUIPermissionsRequest;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static GetUIPermissionsRequest create() => GetUIPermissionsRequest._();
-  @$core.override
  GetUIPermissionsRequest createEmptyInstance() => create();
  static $pb.PbList<GetUIPermissionsRequest> createRepeated() => $pb.PbList<GetUIPermissionsRequest>();
  @$core.pragma('dart2js:noInline')
@@ -173,9 +193,9 @@ class GetUIPermissionsRequest extends $pb.GeneratedMessage {
  static GetUIPermissionsRequest? _defaultInstance;

  @$pb.TagNumber(1)
-  $1.ResourceType get rscType => $_getN(0);
+  $3.ResourceType get rscType => $_getN(0);
  @$pb.TagNumber(1)
-  set rscType($1.ResourceType value) => $_setField(1, value);
+  set rscType($3.ResourceType v) { $_setField(1, v); }
  @$pb.TagNumber(1)
  $core.bool hasRscType() => $_has(0);
  @$pb.TagNumber(1)
@@ -184,7 +204,7 @@ class GetUIPermissionsRequest extends $pb.GeneratedMessage {
  @$pb.TagNumber(2)
  $core.String get client => $_getSZ(1);
  @$pb.TagNumber(2)
-  set client($core.String value) => $_setString(1, value);
+  set client($core.String v) { $_setString(1, v); }
  @$pb.TagNumber(2)
  $core.bool hasClient() => $_has(1);
  @$pb.TagNumber(2)
@@ -193,7 +213,7 @@ class GetUIPermissionsRequest extends $pb.GeneratedMessage {
  @$pb.TagNumber(3)
  $core.String get service => $_getSZ(2);
  @$pb.TagNumber(3)
-  set service($core.String value) => $_setString(2, value);
+  set service($core.String v) { $_setString(2, v); }
  @$pb.TagNumber(3)
  $core.bool hasService() => $_has(2);
  @$pb.TagNumber(3)
@@ -202,34 +222,38 @@ class GetUIPermissionsRequest extends $pb.GeneratedMessage {

 class GetUIPermissionsResult extends $pb.GeneratedMessage {
  factory GetUIPermissionsResult({
-    $core.Iterable<$1.Permission>? permissions,
+    $core.Iterable<$3.Permission>? permissions,
  }) {
-    final result = create();
-    if (permissions != null) result.permissions.addAll(permissions);
-    return result;
+    final $result = create();
+    if (permissions != null) {
+      $result.permissions.addAll(permissions);
+    }
+    return $result;
  }
-
-  GetUIPermissionsResult._();
-
-  factory GetUIPermissionsResult.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory GetUIPermissionsResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  GetUIPermissionsResult._() : super();
+  factory GetUIPermissionsResult.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory GetUIPermissionsResult.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetUIPermissionsResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..pc<$1.Permission>(1, _omitFieldNames ? '' : 'Permissions', $pb.PbFieldType.PM, protoName: 'Permissions', subBuilder: $1.Permission.create)
+    ..pc<$3.Permission>(1, _omitFieldNames ? '' : 'Permissions', $pb.PbFieldType.PM, protoName: 'Permissions', subBuilder: $3.Permission.create)
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  GetUIPermissionsResult clone() => GetUIPermissionsResult()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  GetUIPermissionsResult copyWith(void Function(GetUIPermissionsResult) updates) => super.copyWith((message) => updates(message as GetUIPermissionsResult)) as GetUIPermissionsResult;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static GetUIPermissionsResult create() => GetUIPermissionsResult._();
-  @$core.override
  GetUIPermissionsResult createEmptyInstance() => create();
  static $pb.PbList<GetUIPermissionsResult> createRepeated() => $pb.PbList<GetUIPermissionsResult>();
  @$core.pragma('dart2js:noInline')
@@ -237,39 +261,43 @@ class GetUIPermissionsResult extends $pb.GeneratedMessage {
  static GetUIPermissionsResult? _defaultInstance;

  @$pb.TagNumber(1)
-  $pb.PbList<$1.Permission> get permissions => $_getList(0);
+  $pb.PbList<$3.Permission> get permissions => $_getList(0);
 }

 class ListUserUIPermissionsRequest extends $pb.GeneratedMessage {
  factory ListUserUIPermissionsRequest({
    $core.String? client,
  }) {
-    final result = create();
-    if (client != null) result.client = client;
-    return result;
+    final $result = create();
+    if (client != null) {
+      $result.client = client;
+    }
+    return $result;
  }
-
-  ListUserUIPermissionsRequest._();
-
-  factory ListUserUIPermissionsRequest.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory ListUserUIPermissionsRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  ListUserUIPermissionsRequest._() : super();
+  factory ListUserUIPermissionsRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory ListUserUIPermissionsRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ListUserUIPermissionsRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
    ..aOS(2, _omitFieldNames ? '' : 'Client', protoName: 'Client')
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  ListUserUIPermissionsRequest clone() => ListUserUIPermissionsRequest()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  ListUserUIPermissionsRequest copyWith(void Function(ListUserUIPermissionsRequest) updates) => super.copyWith((message) => updates(message as ListUserUIPermissionsRequest)) as ListUserUIPermissionsRequest;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static ListUserUIPermissionsRequest create() => ListUserUIPermissionsRequest._();
-  @$core.override
  ListUserUIPermissionsRequest createEmptyInstance() => create();
  static $pb.PbList<ListUserUIPermissionsRequest> createRepeated() => $pb.PbList<ListUserUIPermissionsRequest>();
  @$core.pragma('dart2js:noInline')
@@ -279,7 +307,7 @@ class ListUserUIPermissionsRequest extends $pb.GeneratedMessage {
  @$pb.TagNumber(2)
  $core.String get client => $_getSZ(0);
  @$pb.TagNumber(2)
-  set client($core.String value) => $_setString(0, value);
+  set client($core.String v) { $_setString(0, v); }
  @$pb.TagNumber(2)
  $core.bool hasClient() => $_has(0);
  @$pb.TagNumber(2)
@@ -288,34 +316,38 @@ class ListUserUIPermissionsRequest extends $pb.GeneratedMessage {

 class ListUserUIPermissionsResult extends $pb.GeneratedMessage {
  factory ListUserUIPermissionsResult({
-    $core.Iterable<$1.UserUIPermissions>? permissions,
+    $core.Iterable<$3.UserUIPermissions>? permissions,
  }) {
-    final result = create();
-    if (permissions != null) result.permissions.addAll(permissions);
-    return result;
+    final $result = create();
+    if (permissions != null) {
+      $result.permissions.addAll(permissions);
+    }
+    return $result;
  }
-
-  ListUserUIPermissionsResult._();
-
-  factory ListUserUIPermissionsResult.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory ListUserUIPermissionsResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  ListUserUIPermissionsResult._() : super();
+  factory ListUserUIPermissionsResult.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory ListUserUIPermissionsResult.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ListUserUIPermissionsResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..pc<$1.UserUIPermissions>(2, _omitFieldNames ? '' : 'Permissions', $pb.PbFieldType.PM, protoName: 'Permissions', subBuilder: $1.UserUIPermissions.create)
+    ..pc<$3.UserUIPermissions>(2, _omitFieldNames ? '' : 'Permissions', $pb.PbFieldType.PM, protoName: 'Permissions', subBuilder: $3.UserUIPermissions.create)
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  ListUserUIPermissionsResult clone() => ListUserUIPermissionsResult()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  ListUserUIPermissionsResult copyWith(void Function(ListUserUIPermissionsResult) updates) => super.copyWith((message) => updates(message as ListUserUIPermissionsResult)) as ListUserUIPermissionsResult;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static ListUserUIPermissionsResult create() => ListUserUIPermissionsResult._();
-  @$core.override
  ListUserUIPermissionsResult createEmptyInstance() => create();
  static $pb.PbList<ListUserUIPermissionsResult> createRepeated() => $pb.PbList<ListUserUIPermissionsResult>();
  @$core.pragma('dart2js:noInline')
@@ -323,54 +355,68 @@ class ListUserUIPermissionsResult extends $pb.GeneratedMessage {
  static ListUserUIPermissionsResult? _defaultInstance;

  @$pb.TagNumber(2)
-  $pb.PbList<$1.UserUIPermissions> get permissions => $_getList(0);
+  $pb.PbList<$3.UserUIPermissions> get permissions => $_getList(0);
 }

 class RegisterPackageRequest extends $pb.GeneratedMessage {
  factory RegisterPackageRequest({
    $core.String? packageName,
-    $core.Iterable<$1.ClientAPI>? clients,
+    $core.Iterable<$3.ClientAPI>? clients,
    $core.bool? forceFullScopeCreation,
-    $core.Iterable<$2.Role>? roles,
-    $core.Iterable<$1.ModuleRegistration>? workflows,
-    $core.Iterable<$3.Module>? modules,
+    $core.Iterable<$52.Role>? roles,
+    $core.Iterable<$3.ModuleRegistration>? workflows,
+    $core.Iterable<$34.Module>? modules,
  }) {
-    final result = create();
-    if (packageName != null) result.packageName = packageName;
-    if (clients != null) result.clients.addAll(clients);
-    if (forceFullScopeCreation != null) result.forceFullScopeCreation = forceFullScopeCreation;
-    if (roles != null) result.roles.addAll(roles);
-    if (workflows != null) result.workflows.addAll(workflows);
-    if (modules != null) result.modules.addAll(modules);
-    return result;
+    final $result = create();
+    if (packageName != null) {
+      $result.packageName = packageName;
+    }
+    if (clients != null) {
+      $result.clients.addAll(clients);
+    }
+    if (forceFullScopeCreation != null) {
+      $result.forceFullScopeCreation = forceFullScopeCreation;
+    }
+    if (roles != null) {
+      $result.roles.addAll(roles);
+    }
+    if (workflows != null) {
+      $result.workflows.addAll(workflows);
+    }
+    if (modules != null) {
+      $result.modules.addAll(modules);
+    }
+    return $result;
  }
-
-  RegisterPackageRequest._();
-
-  factory RegisterPackageRequest.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory RegisterPackageRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  RegisterPackageRequest._() : super();
+  factory RegisterPackageRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory RegisterPackageRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'RegisterPackageRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
    ..aOS(1, _omitFieldNames ? '' : 'PackageName', protoName: 'PackageName')
-    ..pc<$1.ClientAPI>(2, _omitFieldNames ? '' : 'Clients', $pb.PbFieldType.PM, protoName: 'Clients', subBuilder: $1.ClientAPI.create)
+    ..pc<$3.ClientAPI>(2, _omitFieldNames ? '' : 'Clients', $pb.PbFieldType.PM, protoName: 'Clients', subBuilder: $3.ClientAPI.create)
    ..aOB(3, _omitFieldNames ? '' : 'ForceFullScopeCreation', protoName: 'ForceFullScopeCreation')
-    ..pc<$2.Role>(4, _omitFieldNames ? '' : 'Roles', $pb.PbFieldType.PM, protoName: 'Roles', subBuilder: $2.Role.create)
-    ..pc<$1.ModuleRegistration>(5, _omitFieldNames ? '' : 'Workflows', $pb.PbFieldType.PM, protoName: 'Workflows', subBuilder: $1.ModuleRegistration.create)
-    ..pc<$3.Module>(6, _omitFieldNames ? '' : 'Modules', $pb.PbFieldType.PM, protoName: 'Modules', subBuilder: $3.Module.create)
+    ..pc<$52.Role>(4, _omitFieldNames ? '' : 'Roles', $pb.PbFieldType.PM, protoName: 'Roles', subBuilder: $52.Role.create)
+    ..pc<$3.ModuleRegistration>(5, _omitFieldNames ? '' : 'Workflows', $pb.PbFieldType.PM, protoName: 'Workflows', subBuilder: $3.ModuleRegistration.create)
+    ..pc<$34.Module>(6, _omitFieldNames ? '' : 'Modules', $pb.PbFieldType.PM, protoName: 'Modules', subBuilder: $34.Module.create)
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  RegisterPackageRequest clone() => RegisterPackageRequest()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  RegisterPackageRequest copyWith(void Function(RegisterPackageRequest) updates) => super.copyWith((message) => updates(message as RegisterPackageRequest)) as RegisterPackageRequest;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static RegisterPackageRequest create() => RegisterPackageRequest._();
-  @$core.override
  RegisterPackageRequest createEmptyInstance() => create();
  static $pb.PbList<RegisterPackageRequest> createRepeated() => $pb.PbList<RegisterPackageRequest>();
  @$core.pragma('dart2js:noInline')
@@ -380,57 +426,59 @@ class RegisterPackageRequest extends $pb.GeneratedMessage {
  @$pb.TagNumber(1)
  $core.String get packageName => $_getSZ(0);
  @$pb.TagNumber(1)
-  set packageName($core.String value) => $_setString(0, value);
+  set packageName($core.String v) { $_setString(0, v); }
  @$pb.TagNumber(1)
  $core.bool hasPackageName() => $_has(0);
  @$pb.TagNumber(1)
  void clearPackageName() => $_clearField(1);

  @$pb.TagNumber(2)
-  $pb.PbList<$1.ClientAPI> get clients => $_getList(1);
+  $pb.PbList<$3.ClientAPI> get clients => $_getList(1);

  @$pb.TagNumber(3)
  $core.bool get forceFullScopeCreation => $_getBF(2);
  @$pb.TagNumber(3)
-  set forceFullScopeCreation($core.bool value) => $_setBool(2, value);
+  set forceFullScopeCreation($core.bool v) { $_setBool(2, v); }
  @$pb.TagNumber(3)
  $core.bool hasForceFullScopeCreation() => $_has(2);
  @$pb.TagNumber(3)
  void clearForceFullScopeCreation() => $_clearField(3);

  @$pb.TagNumber(4)
-  $pb.PbList<$2.Role> get roles => $_getList(3);
+  $pb.PbList<$52.Role> get roles => $_getList(3);

  @$pb.TagNumber(5)
-  $pb.PbList<$1.ModuleRegistration> get workflows => $_getList(4);
+  $pb.PbList<$3.ModuleRegistration> get workflows => $_getList(4);

  @$pb.TagNumber(6)
-  $pb.PbList<$3.Module> get modules => $_getList(5);
+  $pb.PbList<$34.Module> get modules => $_getList(5);
 }

 class RegisterPackageResult extends $pb.GeneratedMessage {
  factory RegisterPackageResult() => create();
-
-  RegisterPackageResult._();
-
-  factory RegisterPackageResult.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory RegisterPackageResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  RegisterPackageResult._() : super();
+  factory RegisterPackageResult.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory RegisterPackageResult.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'RegisterPackageResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  RegisterPackageResult clone() => RegisterPackageResult()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  RegisterPackageResult copyWith(void Function(RegisterPackageResult) updates) => super.copyWith((message) => updates(message as RegisterPackageResult)) as RegisterPackageResult;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static RegisterPackageResult create() => RegisterPackageResult._();
-  @$core.override
  RegisterPackageResult createEmptyInstance() => create();
  static $pb.PbList<RegisterPackageResult> createRepeated() => $pb.PbList<RegisterPackageResult>();
  @$core.pragma('dart2js:noInline')
@@ -442,38 +490,46 @@ class CreateScopeRequest extends $pb.GeneratedMessage {
  factory CreateScopeRequest({
    $core.String? moduleName,
    $core.String? client,
-    $1.Scope? scope,
+    $3.Scope? scope,
  }) {
-    final result = create();
-    if (moduleName != null) result.moduleName = moduleName;
-    if (client != null) result.client = client;
-    if (scope != null) result.scope = scope;
-    return result;
+    final $result = create();
+    if (moduleName != null) {
+      $result.moduleName = moduleName;
+    }
+    if (client != null) {
+      $result.client = client;
+    }
+    if (scope != null) {
+      $result.scope = scope;
+    }
+    return $result;
  }
-
-  CreateScopeRequest._();
-
-  factory CreateScopeRequest.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory CreateScopeRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  CreateScopeRequest._() : super();
+  factory CreateScopeRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory CreateScopeRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CreateScopeRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
    ..aOS(1, _omitFieldNames ? '' : 'ModuleName', protoName: 'ModuleName')
    ..aOS(2, _omitFieldNames ? '' : 'Client', protoName: 'Client')
-    ..aOM<$1.Scope>(3, _omitFieldNames ? '' : 'Scope', protoName: 'Scope', subBuilder: $1.Scope.create)
+    ..aOM<$3.Scope>(3, _omitFieldNames ? '' : 'Scope', protoName: 'Scope', subBuilder: $3.Scope.create)
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  CreateScopeRequest clone() => CreateScopeRequest()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  CreateScopeRequest copyWith(void Function(CreateScopeRequest) updates) => super.copyWith((message) => updates(message as CreateScopeRequest)) as CreateScopeRequest;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static CreateScopeRequest create() => CreateScopeRequest._();
-  @$core.override
  CreateScopeRequest createEmptyInstance() => create();
  static $pb.PbList<CreateScopeRequest> createRepeated() => $pb.PbList<CreateScopeRequest>();
  @$core.pragma('dart2js:noInline')
@@ -483,7 +539,7 @@ class CreateScopeRequest extends $pb.GeneratedMessage {
  @$pb.TagNumber(1)
  $core.String get moduleName => $_getSZ(0);
  @$pb.TagNumber(1)
-  set moduleName($core.String value) => $_setString(0, value);
+  set moduleName($core.String v) { $_setString(0, v); }
  @$pb.TagNumber(1)
  $core.bool hasModuleName() => $_has(0);
  @$pb.TagNumber(1)
@@ -492,47 +548,49 @@ class CreateScopeRequest extends $pb.GeneratedMessage {
  @$pb.TagNumber(2)
  $core.String get client => $_getSZ(1);
  @$pb.TagNumber(2)
-  set client($core.String value) => $_setString(1, value);
+  set client($core.String v) { $_setString(1, v); }
  @$pb.TagNumber(2)
  $core.bool hasClient() => $_has(1);
  @$pb.TagNumber(2)
  void clearClient() => $_clearField(2);

  @$pb.TagNumber(3)
-  $1.Scope get scope => $_getN(2);
+  $3.Scope get scope => $_getN(2);
  @$pb.TagNumber(3)
-  set scope($1.Scope value) => $_setField(3, value);
+  set scope($3.Scope v) { $_setField(3, v); }
  @$pb.TagNumber(3)
  $core.bool hasScope() => $_has(2);
  @$pb.TagNumber(3)
  void clearScope() => $_clearField(3);
  @$pb.TagNumber(3)
-  $1.Scope ensureScope() => $_ensure(2);
+  $3.Scope ensureScope() => $_ensure(2);
 }

 class CreateScopeResult extends $pb.GeneratedMessage {
  factory CreateScopeResult() => create();
-
-  CreateScopeResult._();
-
-  factory CreateScopeResult.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory CreateScopeResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  CreateScopeResult._() : super();
+  factory CreateScopeResult.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory CreateScopeResult.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CreateScopeResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  CreateScopeResult clone() => CreateScopeResult()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  CreateScopeResult copyWith(void Function(CreateScopeResult) updates) => super.copyWith((message) => updates(message as CreateScopeResult)) as CreateScopeResult;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static CreateScopeResult create() => CreateScopeResult._();
-  @$core.override
  CreateScopeResult createEmptyInstance() => create();
  static $pb.PbList<CreateScopeResult> createRepeated() => $pb.PbList<CreateScopeResult>();
  @$core.pragma('dart2js:noInline')
@@ -544,38 +602,46 @@ class DeleteScopeRequest extends $pb.GeneratedMessage {
  factory DeleteScopeRequest({
    $core.String? moduleName,
    $core.String? client,
-    $1.Scope? scope,
+    $3.Scope? scope,
  }) {
-    final result = create();
-    if (moduleName != null) result.moduleName = moduleName;
-    if (client != null) result.client = client;
-    if (scope != null) result.scope = scope;
-    return result;
+    final $result = create();
+    if (moduleName != null) {
+      $result.moduleName = moduleName;
+    }
+    if (client != null) {
+      $result.client = client;
+    }
+    if (scope != null) {
+      $result.scope = scope;
+    }
+    return $result;
  }
-
-  DeleteScopeRequest._();
-
-  factory DeleteScopeRequest.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory DeleteScopeRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  DeleteScopeRequest._() : super();
+  factory DeleteScopeRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory DeleteScopeRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'DeleteScopeRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
    ..aOS(1, _omitFieldNames ? '' : 'ModuleName', protoName: 'ModuleName')
    ..aOS(2, _omitFieldNames ? '' : 'Client', protoName: 'Client')
-    ..aOM<$1.Scope>(3, _omitFieldNames ? '' : 'Scope', protoName: 'Scope', subBuilder: $1.Scope.create)
+    ..aOM<$3.Scope>(3, _omitFieldNames ? '' : 'Scope', protoName: 'Scope', subBuilder: $3.Scope.create)
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  DeleteScopeRequest clone() => DeleteScopeRequest()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  DeleteScopeRequest copyWith(void Function(DeleteScopeRequest) updates) => super.copyWith((message) => updates(message as DeleteScopeRequest)) as DeleteScopeRequest;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static DeleteScopeRequest create() => DeleteScopeRequest._();
-  @$core.override
  DeleteScopeRequest createEmptyInstance() => create();
  static $pb.PbList<DeleteScopeRequest> createRepeated() => $pb.PbList<DeleteScopeRequest>();
  @$core.pragma('dart2js:noInline')
@@ -585,7 +651,7 @@ class DeleteScopeRequest extends $pb.GeneratedMessage {
  @$pb.TagNumber(1)
  $core.String get moduleName => $_getSZ(0);
  @$pb.TagNumber(1)
-  set moduleName($core.String value) => $_setString(0, value);
+  set moduleName($core.String v) { $_setString(0, v); }
  @$pb.TagNumber(1)
  $core.bool hasModuleName() => $_has(0);
  @$pb.TagNumber(1)
@@ -594,47 +660,49 @@ class DeleteScopeRequest extends $pb.GeneratedMessage {
  @$pb.TagNumber(2)
  $core.String get client => $_getSZ(1);
  @$pb.TagNumber(2)
-  set client($core.String value) => $_setString(1, value);
+  set client($core.String v) { $_setString(1, v); }
  @$pb.TagNumber(2)
  $core.bool hasClient() => $_has(1);
  @$pb.TagNumber(2)
  void clearClient() => $_clearField(2);

  @$pb.TagNumber(3)
-  $1.Scope get scope => $_getN(2);
+  $3.Scope get scope => $_getN(2);
  @$pb.TagNumber(3)
-  set scope($1.Scope value) => $_setField(3, value);
+  set scope($3.Scope v) { $_setField(3, v); }
  @$pb.TagNumber(3)
  $core.bool hasScope() => $_has(2);
  @$pb.TagNumber(3)
  void clearScope() => $_clearField(3);
  @$pb.TagNumber(3)
-  $1.Scope ensureScope() => $_ensure(2);
+  $3.Scope ensureScope() => $_ensure(2);
 }

 class DeleteScopeResult extends $pb.GeneratedMessage {
  factory DeleteScopeResult() => create();
-
-  DeleteScopeResult._();
-
-  factory DeleteScopeResult.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory DeleteScopeResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  DeleteScopeResult._() : super();
+  factory DeleteScopeResult.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory DeleteScopeResult.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'DeleteScopeResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  DeleteScopeResult clone() => DeleteScopeResult()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  DeleteScopeResult copyWith(void Function(DeleteScopeResult) updates) => super.copyWith((message) => updates(message as DeleteScopeResult)) as DeleteScopeResult;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static DeleteScopeResult create() => DeleteScopeResult._();
-  @$core.override
  DeleteScopeResult createEmptyInstance() => create();
  static $pb.PbList<DeleteScopeResult> createRepeated() => $pb.PbList<DeleteScopeResult>();
  @$core.pragma('dart2js:noInline')
@@ -645,36 +713,42 @@ class DeleteScopeResult extends $pb.GeneratedMessage {
 class CleanScopeRequest extends $pb.GeneratedMessage {
  factory CleanScopeRequest({
    $core.String? client,
-    $1.Scope? scope,
+    $3.Scope? scope,
  }) {
-    final result = create();
-    if (client != null) result.client = client;
-    if (scope != null) result.scope = scope;
-    return result;
+    final $result = create();
+    if (client != null) {
+      $result.client = client;
+    }
+    if (scope != null) {
+      $result.scope = scope;
+    }
+    return $result;
  }
-
-  CleanScopeRequest._();
-
-  factory CleanScopeRequest.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory CleanScopeRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  CleanScopeRequest._() : super();
+  factory CleanScopeRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory CleanScopeRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CleanScopeRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
    ..aOS(1, _omitFieldNames ? '' : 'Client', protoName: 'Client')
-    ..aOM<$1.Scope>(2, _omitFieldNames ? '' : 'Scope', protoName: 'Scope', subBuilder: $1.Scope.create)
+    ..aOM<$3.Scope>(2, _omitFieldNames ? '' : 'Scope', protoName: 'Scope', subBuilder: $3.Scope.create)
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  CleanScopeRequest clone() => CleanScopeRequest()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  CleanScopeRequest copyWith(void Function(CleanScopeRequest) updates) => super.copyWith((message) => updates(message as CleanScopeRequest)) as CleanScopeRequest;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static CleanScopeRequest create() => CleanScopeRequest._();
-  @$core.override
  CleanScopeRequest createEmptyInstance() => create();
  static $pb.PbList<CleanScopeRequest> createRepeated() => $pb.PbList<CleanScopeRequest>();
  @$core.pragma('dart2js:noInline')
@@ -684,47 +758,49 @@ class CleanScopeRequest extends $pb.GeneratedMessage {
  @$pb.TagNumber(1)
  $core.String get client => $_getSZ(0);
  @$pb.TagNumber(1)
-  set client($core.String value) => $_setString(0, value);
+  set client($core.String v) { $_setString(0, v); }
  @$pb.TagNumber(1)
  $core.bool hasClient() => $_has(0);
  @$pb.TagNumber(1)
  void clearClient() => $_clearField(1);

  @$pb.TagNumber(2)
-  $1.Scope get scope => $_getN(1);
+  $3.Scope get scope => $_getN(1);
  @$pb.TagNumber(2)
-  set scope($1.Scope value) => $_setField(2, value);
+  set scope($3.Scope v) { $_setField(2, v); }
  @$pb.TagNumber(2)
  $core.bool hasScope() => $_has(1);
  @$pb.TagNumber(2)
  void clearScope() => $_clearField(2);
  @$pb.TagNumber(2)
-  $1.Scope ensureScope() => $_ensure(1);
+  $3.Scope ensureScope() => $_ensure(1);
 }

 class CleanScopeResult extends $pb.GeneratedMessage {
  factory CleanScopeResult() => create();
-
-  CleanScopeResult._();
-
-  factory CleanScopeResult.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory CleanScopeResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  CleanScopeResult._() : super();
+  factory CleanScopeResult.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory CleanScopeResult.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CleanScopeResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  CleanScopeResult clone() => CleanScopeResult()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  CleanScopeResult copyWith(void Function(CleanScopeResult) updates) => super.copyWith((message) => updates(message as CleanScopeResult)) as CleanScopeResult;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static CleanScopeResult create() => CleanScopeResult._();
-  @$core.override
  CleanScopeResult createEmptyInstance() => create();
  static $pb.PbList<CleanScopeResult> createRepeated() => $pb.PbList<CleanScopeResult>();
  @$core.pragma('dart2js:noInline')
@@ -733,5 +809,5 @@ class CleanScopeResult extends $pb.GeneratedMessage {
 }


-const $core.bool _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
-const $core.bool _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
+const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
+const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
--- a/lib/api.pbenum.dart
+++ b/lib/api.pbenum.dart
@@ -1,12 +1,11 @@
-// This is a generated file - do not edit.
 //
-// Generated from api.proto.
-
+//  Generated code. Do not modify.
+//  source: api.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

--- a/lib/api.pbgrpc.dart
+++ b/lib/api.pbgrpc.dart
@@ -1,14 +1,13 @@
-// This is a generated file - do not edit.
 //
-// Generated from api.proto.
-
+//  Generated code. Do not modify.
+//  source: api.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:async' as $async;
 import 'dart:core' as $core;
@@ -16,80 +15,70 @@ import 'dart:core' as $core;
 import 'package:grpc/service_api.dart' as $grpc;
 import 'package:protobuf/protobuf.dart' as $pb;

-import 'api.pb.dart' as $0;
+import 'api.pb.dart' as $6;

 export 'api.pb.dart';

@$pb.GrpcServiceName('api.APIService')
 class APIServiceClient extends $grpc.Client {
-  /// The hostname for this service.
-  static const $core.String defaultHost = '';
-
-  /// OAuth scopes needed for the client.
-  static const $core.List<$core.String> oauthScopes = [
-    '',
-  ];
+  static final _$getPermissions = $grpc.ClientMethod<$6.GetPermissionsRequest, $6.GetPermissionsResult>(
+      '/api.APIService/GetPermissions',
+      ($6.GetPermissionsRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $6.GetPermissionsResult.fromBuffer(value));
+  static final _$getUIPermissions = $grpc.ClientMethod<$6.GetUIPermissionsRequest, $6.GetUIPermissionsResult>(
+      '/api.APIService/GetUIPermissions',
+      ($6.GetUIPermissionsRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $6.GetUIPermissionsResult.fromBuffer(value));
+  static final _$listUserUIPermissions = $grpc.ClientMethod<$6.ListUserUIPermissionsRequest, $6.ListUserUIPermissionsResult>(
+      '/api.APIService/ListUserUIPermissions',
+      ($6.ListUserUIPermissionsRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $6.ListUserUIPermissionsResult.fromBuffer(value));
+  static final _$registerPackage = $grpc.ClientMethod<$6.RegisterPackageRequest, $6.RegisterPackageResult>(
+      '/api.APIService/RegisterPackage',
+      ($6.RegisterPackageRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $6.RegisterPackageResult.fromBuffer(value));
+  static final _$createScope = $grpc.ClientMethod<$6.CreateScopeRequest, $6.CreateScopeResult>(
+      '/api.APIService/CreateScope',
+      ($6.CreateScopeRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $6.CreateScopeResult.fromBuffer(value));
+  static final _$deleteScope = $grpc.ClientMethod<$6.DeleteScopeRequest, $6.DeleteScopeResult>(
+      '/api.APIService/DeleteScope',
+      ($6.DeleteScopeRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $6.DeleteScopeResult.fromBuffer(value));
+  static final _$cleanScope = $grpc.ClientMethod<$6.CleanScopeRequest, $6.CleanScopeResult>(
+      '/api.APIService/CleanScope',
+      ($6.CleanScopeRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $6.CleanScopeResult.fromBuffer(value));

  APIServiceClient(super.channel, {super.options, super.interceptors});

-  $grpc.ResponseFuture<$0.GetPermissionsResult> getPermissions($0.GetPermissionsRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$6.GetPermissionsResult> getPermissions($6.GetPermissionsRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$getPermissions, request, options: options);
  }

-  $grpc.ResponseFuture<$0.GetUIPermissionsResult> getUIPermissions($0.GetUIPermissionsRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$6.GetUIPermissionsResult> getUIPermissions($6.GetUIPermissionsRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$getUIPermissions, request, options: options);
  }

-  $grpc.ResponseFuture<$0.ListUserUIPermissionsResult> listUserUIPermissions($0.ListUserUIPermissionsRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$6.ListUserUIPermissionsResult> listUserUIPermissions($6.ListUserUIPermissionsRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$listUserUIPermissions, request, options: options);
  }

-  $grpc.ResponseFuture<$0.RegisterPackageResult> registerPackage($0.RegisterPackageRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$6.RegisterPackageResult> registerPackage($6.RegisterPackageRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$registerPackage, request, options: options);
  }

-  $grpc.ResponseFuture<$0.CreateScopeResult> createScope($0.CreateScopeRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$6.CreateScopeResult> createScope($6.CreateScopeRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$createScope, request, options: options);
  }

-  $grpc.ResponseFuture<$0.DeleteScopeResult> deleteScope($0.DeleteScopeRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$6.DeleteScopeResult> deleteScope($6.DeleteScopeRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$deleteScope, request, options: options);
  }

-  $grpc.ResponseFuture<$0.CleanScopeResult> cleanScope($0.CleanScopeRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$6.CleanScopeResult> cleanScope($6.CleanScopeRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$cleanScope, request, options: options);
  }
-
-    // method descriptors
-
-  static final _$getPermissions = $grpc.ClientMethod<$0.GetPermissionsRequest, $0.GetPermissionsResult>(
-      '/api.APIService/GetPermissions',
-      ($0.GetPermissionsRequest value) => value.writeToBuffer(),
-      $0.GetPermissionsResult.fromBuffer);
-  static final _$getUIPermissions = $grpc.ClientMethod<$0.GetUIPermissionsRequest, $0.GetUIPermissionsResult>(
-      '/api.APIService/GetUIPermissions',
-      ($0.GetUIPermissionsRequest value) => value.writeToBuffer(),
-      $0.GetUIPermissionsResult.fromBuffer);
-  static final _$listUserUIPermissions = $grpc.ClientMethod<$0.ListUserUIPermissionsRequest, $0.ListUserUIPermissionsResult>(
-      '/api.APIService/ListUserUIPermissions',
-      ($0.ListUserUIPermissionsRequest value) => value.writeToBuffer(),
-      $0.ListUserUIPermissionsResult.fromBuffer);
-  static final _$registerPackage = $grpc.ClientMethod<$0.RegisterPackageRequest, $0.RegisterPackageResult>(
-      '/api.APIService/RegisterPackage',
-      ($0.RegisterPackageRequest value) => value.writeToBuffer(),
-      $0.RegisterPackageResult.fromBuffer);
-  static final _$createScope = $grpc.ClientMethod<$0.CreateScopeRequest, $0.CreateScopeResult>(
-      '/api.APIService/CreateScope',
-      ($0.CreateScopeRequest value) => value.writeToBuffer(),
-      $0.CreateScopeResult.fromBuffer);
-  static final _$deleteScope = $grpc.ClientMethod<$0.DeleteScopeRequest, $0.DeleteScopeResult>(
-      '/api.APIService/DeleteScope',
-      ($0.DeleteScopeRequest value) => value.writeToBuffer(),
-      $0.DeleteScopeResult.fromBuffer);
-  static final _$cleanScope = $grpc.ClientMethod<$0.CleanScopeRequest, $0.CleanScopeResult>(
-      '/api.APIService/CleanScope',
-      ($0.CleanScopeRequest value) => value.writeToBuffer(),
-      $0.CleanScopeResult.fromBuffer);
 }

@$pb.GrpcServiceName('api.APIService')
@@ -97,97 +86,90 @@ abstract class APIServiceBase extends $grpc.Service {
  $core.String get $name => 'api.APIService';

  APIServiceBase() {
-    $addMethod($grpc.ServiceMethod<$0.GetPermissionsRequest, $0.GetPermissionsResult>(
+    $addMethod($grpc.ServiceMethod<$6.GetPermissionsRequest, $6.GetPermissionsResult>(
        'GetPermissions',
        getPermissions_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.GetPermissionsRequest.fromBuffer(value),
-        ($0.GetPermissionsResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.GetUIPermissionsRequest, $0.GetUIPermissionsResult>(
+        ($core.List<$core.int> value) => $6.GetPermissionsRequest.fromBuffer(value),
+        ($6.GetPermissionsResult value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$6.GetUIPermissionsRequest, $6.GetUIPermissionsResult>(
        'GetUIPermissions',
        getUIPermissions_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.GetUIPermissionsRequest.fromBuffer(value),
-        ($0.GetUIPermissionsResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.ListUserUIPermissionsRequest, $0.ListUserUIPermissionsResult>(
+        ($core.List<$core.int> value) => $6.GetUIPermissionsRequest.fromBuffer(value),
+        ($6.GetUIPermissionsResult value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$6.ListUserUIPermissionsRequest, $6.ListUserUIPermissionsResult>(
        'ListUserUIPermissions',
        listUserUIPermissions_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.ListUserUIPermissionsRequest.fromBuffer(value),
-        ($0.ListUserUIPermissionsResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.RegisterPackageRequest, $0.RegisterPackageResult>(
+        ($core.List<$core.int> value) => $6.ListUserUIPermissionsRequest.fromBuffer(value),
+        ($6.ListUserUIPermissionsResult value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$6.RegisterPackageRequest, $6.RegisterPackageResult>(
        'RegisterPackage',
        registerPackage_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.RegisterPackageRequest.fromBuffer(value),
-        ($0.RegisterPackageResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.CreateScopeRequest, $0.CreateScopeResult>(
+        ($core.List<$core.int> value) => $6.RegisterPackageRequest.fromBuffer(value),
+        ($6.RegisterPackageResult value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$6.CreateScopeRequest, $6.CreateScopeResult>(
        'CreateScope',
        createScope_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.CreateScopeRequest.fromBuffer(value),
-        ($0.CreateScopeResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.DeleteScopeRequest, $0.DeleteScopeResult>(
+        ($core.List<$core.int> value) => $6.CreateScopeRequest.fromBuffer(value),
+        ($6.CreateScopeResult value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$6.DeleteScopeRequest, $6.DeleteScopeResult>(
        'DeleteScope',
        deleteScope_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.DeleteScopeRequest.fromBuffer(value),
-        ($0.DeleteScopeResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.CleanScopeRequest, $0.CleanScopeResult>(
+        ($core.List<$core.int> value) => $6.DeleteScopeRequest.fromBuffer(value),
+        ($6.DeleteScopeResult value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$6.CleanScopeRequest, $6.CleanScopeResult>(
        'CleanScope',
        cleanScope_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.CleanScopeRequest.fromBuffer(value),
-        ($0.CleanScopeResult value) => value.writeToBuffer()));
+        ($core.List<$core.int> value) => $6.CleanScopeRequest.fromBuffer(value),
+        ($6.CleanScopeResult value) => value.writeToBuffer()));
  }

-  $async.Future<$0.GetPermissionsResult> getPermissions_Pre($grpc.ServiceCall $call, $async.Future<$0.GetPermissionsRequest> $request) async {
+  $async.Future<$6.GetPermissionsResult> getPermissions_Pre($grpc.ServiceCall $call, $async.Future<$6.GetPermissionsRequest> $request) async {
    return getPermissions($call, await $request);
  }

-  $async.Future<$0.GetPermissionsResult> getPermissions($grpc.ServiceCall call, $0.GetPermissionsRequest request);
-
-  $async.Future<$0.GetUIPermissionsResult> getUIPermissions_Pre($grpc.ServiceCall $call, $async.Future<$0.GetUIPermissionsRequest> $request) async {
+  $async.Future<$6.GetUIPermissionsResult> getUIPermissions_Pre($grpc.ServiceCall $call, $async.Future<$6.GetUIPermissionsRequest> $request) async {
    return getUIPermissions($call, await $request);
  }

-  $async.Future<$0.GetUIPermissionsResult> getUIPermissions($grpc.ServiceCall call, $0.GetUIPermissionsRequest request);
-
-  $async.Future<$0.ListUserUIPermissionsResult> listUserUIPermissions_Pre($grpc.ServiceCall $call, $async.Future<$0.ListUserUIPermissionsRequest> $request) async {
+  $async.Future<$6.ListUserUIPermissionsResult> listUserUIPermissions_Pre($grpc.ServiceCall $call, $async.Future<$6.ListUserUIPermissionsRequest> $request) async {
    return listUserUIPermissions($call, await $request);
  }

-  $async.Future<$0.ListUserUIPermissionsResult> listUserUIPermissions($grpc.ServiceCall call, $0.ListUserUIPermissionsRequest request);
-
-  $async.Future<$0.RegisterPackageResult> registerPackage_Pre($grpc.ServiceCall $call, $async.Future<$0.RegisterPackageRequest> $request) async {
+  $async.Future<$6.RegisterPackageResult> registerPackage_Pre($grpc.ServiceCall $call, $async.Future<$6.RegisterPackageRequest> $request) async {
    return registerPackage($call, await $request);
  }

-  $async.Future<$0.RegisterPackageResult> registerPackage($grpc.ServiceCall call, $0.RegisterPackageRequest request);
-
-  $async.Future<$0.CreateScopeResult> createScope_Pre($grpc.ServiceCall $call, $async.Future<$0.CreateScopeRequest> $request) async {
+  $async.Future<$6.CreateScopeResult> createScope_Pre($grpc.ServiceCall $call, $async.Future<$6.CreateScopeRequest> $request) async {
    return createScope($call, await $request);
  }

-  $async.Future<$0.CreateScopeResult> createScope($grpc.ServiceCall call, $0.CreateScopeRequest request);
-
-  $async.Future<$0.DeleteScopeResult> deleteScope_Pre($grpc.ServiceCall $call, $async.Future<$0.DeleteScopeRequest> $request) async {
+  $async.Future<$6.DeleteScopeResult> deleteScope_Pre($grpc.ServiceCall $call, $async.Future<$6.DeleteScopeRequest> $request) async {
    return deleteScope($call, await $request);
  }

-  $async.Future<$0.DeleteScopeResult> deleteScope($grpc.ServiceCall call, $0.DeleteScopeRequest request);
-
-  $async.Future<$0.CleanScopeResult> cleanScope_Pre($grpc.ServiceCall $call, $async.Future<$0.CleanScopeRequest> $request) async {
+  $async.Future<$6.CleanScopeResult> cleanScope_Pre($grpc.ServiceCall $call, $async.Future<$6.CleanScopeRequest> $request) async {
    return cleanScope($call, await $request);
  }

-  $async.Future<$0.CleanScopeResult> cleanScope($grpc.ServiceCall call, $0.CleanScopeRequest request);
-
+  $async.Future<$6.GetPermissionsResult> getPermissions($grpc.ServiceCall call, $6.GetPermissionsRequest request);
+  $async.Future<$6.GetUIPermissionsResult> getUIPermissions($grpc.ServiceCall call, $6.GetUIPermissionsRequest request);
+  $async.Future<$6.ListUserUIPermissionsResult> listUserUIPermissions($grpc.ServiceCall call, $6.ListUserUIPermissionsRequest request);
+  $async.Future<$6.RegisterPackageResult> registerPackage($grpc.ServiceCall call, $6.RegisterPackageRequest request);
+  $async.Future<$6.CreateScopeResult> createScope($grpc.ServiceCall call, $6.CreateScopeRequest request);
+  $async.Future<$6.DeleteScopeResult> deleteScope($grpc.ServiceCall call, $6.DeleteScopeRequest request);
+  $async.Future<$6.CleanScopeResult> cleanScope($grpc.ServiceCall call, $6.CleanScopeRequest request);
 }
--- a/lib/api.pbjson.dart
+++ b/lib/api.pbjson.dart
@@ -1,14 +1,13 @@
-// This is a generated file - do not edit.
 //
-// Generated from api.proto.
-
+//  Generated code. Do not modify.
+//  source: api.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
--- a/lib/appointment.pb.dart
+++ b/lib/appointment.pb.dart
@@ -1,393 +0,0 @@
-// This is a generated file - do not edit.
-//
-// Generated from appointment.proto.
-
-// @dart = 3.3
-
-// ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
-
-import 'dart:core' as $core;
-
-import 'package:protobuf/protobuf.dart' as $pb;
-
-import 'collabShared.pb.dart' as $2;
-import 'shared.pb.dart' as $0;
-import 'slotbooking.pb.dart' as $1;
-
-export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
-
-///
-/// Aggregation object message
-class Appointment extends $pb.GeneratedMessage {
-  factory Appointment({
-    $0.EventHeader? lastEventHeader,
-    $0.EntityID? iD,
-    AppointmentPayload? payload,
-  }) {
-    final result = create();
-    if (lastEventHeader != null) result.lastEventHeader = lastEventHeader;
-    if (iD != null) result.iD = iD;
-    if (payload != null) result.payload = payload;
-    return result;
-  }
-
-  Appointment._();
-
-  factory Appointment.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory Appointment.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Appointment', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$0.EventHeader>(1, _omitFieldNames ? '' : 'LastEventHeader', protoName: 'LastEventHeader', subBuilder: $0.EventHeader.create)
-    ..aOM<$0.EntityID>(2, _omitFieldNames ? '' : 'ID', protoName: 'ID', subBuilder: $0.EntityID.create)
-    ..aOM<AppointmentPayload>(3, _omitFieldNames ? '' : 'Payload', protoName: 'Payload', subBuilder: AppointmentPayload.create)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Appointment clone() => Appointment()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Appointment copyWith(void Function(Appointment) updates) => super.copyWith((message) => updates(message as Appointment)) as Appointment;
-
-  @$core.override
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static Appointment create() => Appointment._();
-  @$core.override
-  Appointment createEmptyInstance() => create();
-  static $pb.PbList<Appointment> createRepeated() => $pb.PbList<Appointment>();
-  @$core.pragma('dart2js:noInline')
-  static Appointment getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Appointment>(create);
-  static Appointment? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  $0.EventHeader get lastEventHeader => $_getN(0);
-  @$pb.TagNumber(1)
-  set lastEventHeader($0.EventHeader value) => $_setField(1, value);
-  @$pb.TagNumber(1)
-  $core.bool hasLastEventHeader() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearLastEventHeader() => $_clearField(1);
-  @$pb.TagNumber(1)
-  $0.EventHeader ensureLastEventHeader() => $_ensure(0);
-
-  @$pb.TagNumber(2)
-  $0.EntityID get iD => $_getN(1);
-  @$pb.TagNumber(2)
-  set iD($0.EntityID value) => $_setField(2, value);
-  @$pb.TagNumber(2)
-  $core.bool hasID() => $_has(1);
-  @$pb.TagNumber(2)
-  void clearID() => $_clearField(2);
-  @$pb.TagNumber(2)
-  $0.EntityID ensureID() => $_ensure(1);
-
-  @$pb.TagNumber(3)
-  AppointmentPayload get payload => $_getN(2);
-  @$pb.TagNumber(3)
-  set payload(AppointmentPayload value) => $_setField(3, value);
-  @$pb.TagNumber(3)
-  $core.bool hasPayload() => $_has(2);
-  @$pb.TagNumber(3)
-  void clearPayload() => $_clearField(3);
-  @$pb.TagNumber(3)
-  AppointmentPayload ensurePayload() => $_ensure(2);
-}
-
-class AppointmentPayload extends $pb.GeneratedMessage {
-  factory AppointmentPayload({
-    $1.AppointmentType? appointmentType,
-    $core.Iterable<$1.Commission>? commissions,
-    $core.Iterable<$1.SegmentationSelection>? segmentationSelections,
-    $core.Iterable<$1.CarrierInformationWithValue>? carrierInformation,
-    $1.Slot? slot,
-    $core.Iterable<$core.String>? emails,
-    $2.AppointmentStatusStruct? status,
-    $core.String? creationDate,
-    $core.Iterable<$0.MetadataElement>? metaData,
-    $core.String? carrierID,
-    $core.String? carrierName,
-    $core.Iterable<$0.AttachmentSummary>? attachments,
-    $core.int? attachmentNumber,
-    $core.bool? hasCommission,
-    $core.Iterable<$core.String>? removedEmails,
-    $core.String? reason,
-    $core.bool? instructionAck,
-  }) {
-    final result = create();
-    if (appointmentType != null) result.appointmentType = appointmentType;
-    if (commissions != null) result.commissions.addAll(commissions);
-    if (segmentationSelections != null) result.segmentationSelections.addAll(segmentationSelections);
-    if (carrierInformation != null) result.carrierInformation.addAll(carrierInformation);
-    if (slot != null) result.slot = slot;
-    if (emails != null) result.emails.addAll(emails);
-    if (status != null) result.status = status;
-    if (creationDate != null) result.creationDate = creationDate;
-    if (metaData != null) result.metaData.addAll(metaData);
-    if (carrierID != null) result.carrierID = carrierID;
-    if (carrierName != null) result.carrierName = carrierName;
-    if (attachments != null) result.attachments.addAll(attachments);
-    if (attachmentNumber != null) result.attachmentNumber = attachmentNumber;
-    if (hasCommission != null) result.hasCommission = hasCommission;
-    if (removedEmails != null) result.removedEmails.addAll(removedEmails);
-    if (reason != null) result.reason = reason;
-    if (instructionAck != null) result.instructionAck = instructionAck;
-    return result;
-  }
-
-  AppointmentPayload._();
-
-  factory AppointmentPayload.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory AppointmentPayload.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'AppointmentPayload', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..e<$1.AppointmentType>(1, _omitFieldNames ? '' : 'AppointmentType', $pb.PbFieldType.OE, protoName: 'AppointmentType', defaultOrMaker: $1.AppointmentType.APPOINTMENT_TYPE_UNKNOWN, valueOf: $1.AppointmentType.valueOf, enumValues: $1.AppointmentType.values)
-    ..pc<$1.Commission>(2, _omitFieldNames ? '' : 'Commissions', $pb.PbFieldType.PM, protoName: 'Commissions', subBuilder: $1.Commission.create)
-    ..pc<$1.SegmentationSelection>(4, _omitFieldNames ? '' : 'SegmentationSelections', $pb.PbFieldType.PM, protoName: 'SegmentationSelections', subBuilder: $1.SegmentationSelection.create)
-    ..pc<$1.CarrierInformationWithValue>(5, _omitFieldNames ? '' : 'CarrierInformation', $pb.PbFieldType.PM, protoName: 'CarrierInformation', subBuilder: $1.CarrierInformationWithValue.create)
-    ..aOM<$1.Slot>(6, _omitFieldNames ? '' : 'Slot', protoName: 'Slot', subBuilder: $1.Slot.create)
-    ..pPS(7, _omitFieldNames ? '' : 'Emails', protoName: 'Emails')
-    ..aOM<$2.AppointmentStatusStruct>(8, _omitFieldNames ? '' : 'Status', protoName: 'Status', subBuilder: $2.AppointmentStatusStruct.create)
-    ..aOS(9, _omitFieldNames ? '' : 'CreationDate', protoName: 'CreationDate')
-    ..pc<$0.MetadataElement>(10, _omitFieldNames ? '' : 'MetaData', $pb.PbFieldType.PM, protoName: 'MetaData', subBuilder: $0.MetadataElement.create)
-    ..aOS(11, _omitFieldNames ? '' : 'CarrierID', protoName: 'CarrierID')
-    ..aOS(12, _omitFieldNames ? '' : 'CarrierName', protoName: 'CarrierName')
-    ..pc<$0.AttachmentSummary>(13, _omitFieldNames ? '' : 'Attachments', $pb.PbFieldType.PM, protoName: 'Attachments', subBuilder: $0.AttachmentSummary.create)
-    ..a<$core.int>(14, _omitFieldNames ? '' : 'AttachmentNumber', $pb.PbFieldType.O3, protoName: 'AttachmentNumber')
-    ..aOB(15, _omitFieldNames ? '' : 'HasCommission', protoName: 'HasCommission')
-    ..pPS(16, _omitFieldNames ? '' : 'RemovedEmails', protoName: 'RemovedEmails')
-    ..aOS(17, _omitFieldNames ? '' : 'Reason', protoName: 'Reason')
-    ..aOB(18, _omitFieldNames ? '' : 'InstructionAck', protoName: 'InstructionAck')
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  AppointmentPayload clone() => AppointmentPayload()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  AppointmentPayload copyWith(void Function(AppointmentPayload) updates) => super.copyWith((message) => updates(message as AppointmentPayload)) as AppointmentPayload;
-
-  @$core.override
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static AppointmentPayload create() => AppointmentPayload._();
-  @$core.override
-  AppointmentPayload createEmptyInstance() => create();
-  static $pb.PbList<AppointmentPayload> createRepeated() => $pb.PbList<AppointmentPayload>();
-  @$core.pragma('dart2js:noInline')
-  static AppointmentPayload getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<AppointmentPayload>(create);
-  static AppointmentPayload? _defaultInstance;
-
-  /// Type of appointment : Expedition / Reception / Both
-  @$pb.TagNumber(1)
-  $1.AppointmentType get appointmentType => $_getN(0);
-  @$pb.TagNumber(1)
-  set appointmentType($1.AppointmentType value) => $_setField(1, value);
-  @$pb.TagNumber(1)
-  $core.bool hasAppointmentType() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearAppointmentType() => $_clearField(1);
-
-  /// List of the orders and projects for which the appointment is made, with the quantities
-  /// TODO  ??
-  @$pb.TagNumber(2)
-  $pb.PbList<$1.Commission> get commissions => $_getList(1);
-
-  /// Set of segmentation constraining the slot booking
-  @$pb.TagNumber(4)
-  $pb.PbList<$1.SegmentationSelection> get segmentationSelections => $_getList(2);
-
-  /// Required carrierInformation, some can be obligatory
-  @$pb.TagNumber(5)
-  $pb.PbList<$1.CarrierInformationWithValue> get carrierInformation => $_getList(3);
-
-  /// The slot booked for the appointment
-  @$pb.TagNumber(6)
-  $1.Slot get slot => $_getN(4);
-  @$pb.TagNumber(6)
-  set slot($1.Slot value) => $_setField(6, value);
-  @$pb.TagNumber(6)
-  $core.bool hasSlot() => $_has(4);
-  @$pb.TagNumber(6)
-  void clearSlot() => $_clearField(6);
-  @$pb.TagNumber(6)
-  $1.Slot ensureSlot() => $_ensure(4);
-
-  /// User mails being notified on this appointment
-  /// TODO Need to add a structure to store platform user identifiers which can act on this appointment ?
-  @$pb.TagNumber(7)
-  $pb.PbList<$core.String> get emails => $_getList(5);
-
-  /// Appointment Status and status history
-  @$pb.TagNumber(8)
-  $2.AppointmentStatusStruct get status => $_getN(6);
-  @$pb.TagNumber(8)
-  set status($2.AppointmentStatusStruct value) => $_setField(8, value);
-  @$pb.TagNumber(8)
-  $core.bool hasStatus() => $_has(6);
-  @$pb.TagNumber(8)
-  void clearStatus() => $_clearField(8);
-  @$pb.TagNumber(8)
-  $2.AppointmentStatusStruct ensureStatus() => $_ensure(6);
-
-  /// Creation date of the appointment
-  @$pb.TagNumber(9)
-  $core.String get creationDate => $_getSZ(7);
-  @$pb.TagNumber(9)
-  set creationDate($core.String value) => $_setString(7, value);
-  @$pb.TagNumber(9)
-  $core.bool hasCreationDate() => $_has(7);
-  @$pb.TagNumber(9)
-  void clearCreationDate() => $_clearField(9);
-
-  @$pb.TagNumber(10)
-  $pb.PbList<$0.MetadataElement> get metaData => $_getList(8);
-
-  @$pb.TagNumber(11)
-  $core.String get carrierID => $_getSZ(9);
-  @$pb.TagNumber(11)
-  set carrierID($core.String value) => $_setString(9, value);
-  @$pb.TagNumber(11)
-  $core.bool hasCarrierID() => $_has(9);
-  @$pb.TagNumber(11)
-  void clearCarrierID() => $_clearField(11);
-
-  @$pb.TagNumber(12)
-  $core.String get carrierName => $_getSZ(10);
-  @$pb.TagNumber(12)
-  set carrierName($core.String value) => $_setString(10, value);
-  @$pb.TagNumber(12)
-  $core.bool hasCarrierName() => $_has(10);
-  @$pb.TagNumber(12)
-  void clearCarrierName() => $_clearField(12);
-
-  @$pb.TagNumber(13)
-  $pb.PbList<$0.AttachmentSummary> get attachments => $_getList(11);
-
-  @$pb.TagNumber(14)
-  $core.int get attachmentNumber => $_getIZ(12);
-  @$pb.TagNumber(14)
-  set attachmentNumber($core.int value) => $_setSignedInt32(12, value);
-  @$pb.TagNumber(14)
-  $core.bool hasAttachmentNumber() => $_has(12);
-  @$pb.TagNumber(14)
-  void clearAttachmentNumber() => $_clearField(14);
-
-  /// This boolean will be used to either check reason or check the commissions for informations
-  @$pb.TagNumber(15)
-  $core.bool get hasCommission => $_getBF(13);
-  @$pb.TagNumber(15)
-  set hasCommission($core.bool value) => $_setBool(13, value);
-  @$pb.TagNumber(15)
-  $core.bool hasHasCommission() => $_has(13);
-  @$pb.TagNumber(15)
-  void clearHasCommission() => $_clearField(15);
-
-  /// Emails removed from the appointment
-  @$pb.TagNumber(16)
-  $pb.PbList<$core.String> get removedEmails => $_getList(14);
-
-  /// The Reason for which the appointment has no commission
-  @$pb.TagNumber(17)
-  $core.String get reason => $_getSZ(15);
-  @$pb.TagNumber(17)
-  set reason($core.String value) => $_setString(15, value);
-  @$pb.TagNumber(17)
-  $core.bool hasReason() => $_has(15);
-  @$pb.TagNumber(17)
-  void clearReason() => $_clearField(17);
-
-  /// Acknowledgment of the site instructions
-  @$pb.TagNumber(18)
-  $core.bool get instructionAck => $_getBF(16);
-  @$pb.TagNumber(18)
-  set instructionAck($core.bool value) => $_setBool(16, value);
-  @$pb.TagNumber(18)
-  $core.bool hasInstructionAck() => $_has(16);
-  @$pb.TagNumber(18)
-  void clearInstructionAck() => $_clearField(18);
-}
-
-class AppointmentTriplet extends $pb.GeneratedMessage {
-  factory AppointmentTriplet({
-    Appointment? current,
-    Appointment? previous,
-    Appointment? lastEvent,
-  }) {
-    final result = create();
-    if (current != null) result.current = current;
-    if (previous != null) result.previous = previous;
-    if (lastEvent != null) result.lastEvent = lastEvent;
-    return result;
-  }
-
-  AppointmentTriplet._();
-
-  factory AppointmentTriplet.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory AppointmentTriplet.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'AppointmentTriplet', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<Appointment>(1, _omitFieldNames ? '' : 'Current', protoName: 'Current', subBuilder: Appointment.create)
-    ..aOM<Appointment>(2, _omitFieldNames ? '' : 'Previous', protoName: 'Previous', subBuilder: Appointment.create)
-    ..aOM<Appointment>(3, _omitFieldNames ? '' : 'LastEvent', protoName: 'LastEvent', subBuilder: Appointment.create)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  AppointmentTriplet clone() => AppointmentTriplet()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  AppointmentTriplet copyWith(void Function(AppointmentTriplet) updates) => super.copyWith((message) => updates(message as AppointmentTriplet)) as AppointmentTriplet;
-
-  @$core.override
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static AppointmentTriplet create() => AppointmentTriplet._();
-  @$core.override
-  AppointmentTriplet createEmptyInstance() => create();
-  static $pb.PbList<AppointmentTriplet> createRepeated() => $pb.PbList<AppointmentTriplet>();
-  @$core.pragma('dart2js:noInline')
-  static AppointmentTriplet getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<AppointmentTriplet>(create);
-  static AppointmentTriplet? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  Appointment get current => $_getN(0);
-  @$pb.TagNumber(1)
-  set current(Appointment value) => $_setField(1, value);
-  @$pb.TagNumber(1)
-  $core.bool hasCurrent() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearCurrent() => $_clearField(1);
-  @$pb.TagNumber(1)
-  Appointment ensureCurrent() => $_ensure(0);
-
-  @$pb.TagNumber(2)
-  Appointment get previous => $_getN(1);
-  @$pb.TagNumber(2)
-  set previous(Appointment value) => $_setField(2, value);
-  @$pb.TagNumber(2)
-  $core.bool hasPrevious() => $_has(1);
-  @$pb.TagNumber(2)
-  void clearPrevious() => $_clearField(2);
-  @$pb.TagNumber(2)
-  Appointment ensurePrevious() => $_ensure(1);
-
-  @$pb.TagNumber(3)
-  Appointment get lastEvent => $_getN(2);
-  @$pb.TagNumber(3)
-  set lastEvent(Appointment value) => $_setField(3, value);
-  @$pb.TagNumber(3)
-  $core.bool hasLastEvent() => $_has(2);
-  @$pb.TagNumber(3)
-  void clearLastEvent() => $_clearField(3);
-  @$pb.TagNumber(3)
-  Appointment ensureLastEvent() => $_ensure(2);
-}
-
-
-const $core.bool _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
-const $core.bool _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
--- a/lib/appointment.pbenum.dart
+++ b/lib/appointment.pbenum.dart
@@ -1,12 +0,0 @@
-// This is a generated file - do not edit.
-//
-// Generated from appointment.proto.
-
-// @dart = 3.3
-
-// ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
-
--- a/lib/appointment.pbjson.dart
+++ b/lib/appointment.pbjson.dart
@@ -1,102 +0,0 @@
-// This is a generated file - do not edit.
-//
-// Generated from appointment.proto.
-
-// @dart = 3.3
-
-// ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
-
-import 'dart:convert' as $convert;
-import 'dart:core' as $core;
-import 'dart:typed_data' as $typed_data;
-
-@$core.Deprecated('Use appointmentDescriptor instead')
-const Appointment$json = {
-  '1': 'Appointment',
-  '2': [
-    {'1': 'LastEventHeader', '3': 1, '4': 1, '5': 11, '6': '.api.EventHeader', '10': 'LastEventHeader'},
-    {'1': 'ID', '3': 2, '4': 1, '5': 11, '6': '.api.EntityID', '10': 'ID'},
-    {'1': 'Payload', '3': 3, '4': 1, '5': 11, '6': '.api.AppointmentPayload', '10': 'Payload'},
-  ],
-  '7': {},
-};
-
-/// Descriptor for `Appointment`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List appointmentDescriptor = $convert.base64Decode(
-    'CgtBcHBvaW50bWVudBI6Cg9MYXN0RXZlbnRIZWFkZXIYASABKAsyEC5hcGkuRXZlbnRIZWFkZX'
-    'JSD0xhc3RFdmVudEhlYWRlchIdCgJJRBgCIAEoCzINLmFwaS5FbnRpdHlJRFICSUQSMQoHUGF5'
-    'bG9hZBgDIAEoCzIXLmFwaS5BcHBvaW50bWVudFBheWxvYWRSB1BheWxvYWQ6IZJBHgocMhpBZ2'
-    'dyZWdhdGlvbiBvYmplY3QgbWVzc2FnZQ==');
-
-@$core.Deprecated('Use appointmentPayloadDescriptor instead')
-const AppointmentPayload$json = {
-  '1': 'AppointmentPayload',
-  '2': [
-    {'1': 'AppointmentType', '3': 1, '4': 1, '5': 14, '6': '.api.AppointmentType', '10': 'AppointmentType'},
-    {'1': 'Commissions', '3': 2, '4': 3, '5': 11, '6': '.api.Commission', '10': 'Commissions'},
-    {'1': 'SegmentationSelections', '3': 4, '4': 3, '5': 11, '6': '.api.SegmentationSelection', '10': 'SegmentationSelections'},
-    {'1': 'CarrierInformation', '3': 5, '4': 3, '5': 11, '6': '.api.CarrierInformationWithValue', '10': 'CarrierInformation'},
-    {'1': 'Slot', '3': 6, '4': 1, '5': 11, '6': '.api.Slot', '10': 'Slot'},
-    {'1': 'Emails', '3': 7, '4': 3, '5': 9, '8': {}, '10': 'Emails'},
-    {'1': 'RemovedEmails', '3': 16, '4': 3, '5': 9, '8': {}, '10': 'RemovedEmails'},
-    {'1': 'Status', '3': 8, '4': 1, '5': 11, '6': '.api.AppointmentStatusStruct', '8': {}, '10': 'Status'},
-    {'1': 'CreationDate', '3': 9, '4': 1, '5': 9, '8': {}, '10': 'CreationDate'},
-    {'1': 'MetaData', '3': 10, '4': 3, '5': 11, '6': '.api.MetadataElement', '8': {}, '10': 'MetaData'},
-    {'1': 'CarrierID', '3': 11, '4': 1, '5': 9, '10': 'CarrierID'},
-    {'1': 'CarrierName', '3': 12, '4': 1, '5': 9, '10': 'CarrierName'},
-    {'1': 'Attachments', '3': 13, '4': 3, '5': 11, '6': '.api.AttachmentSummary', '8': {}, '10': 'Attachments'},
-    {'1': 'AttachmentNumber', '3': 14, '4': 1, '5': 5, '8': {}, '10': 'AttachmentNumber'},
-    {'1': 'HasCommission', '3': 15, '4': 1, '5': 8, '10': 'HasCommission'},
-    {'1': 'Reason', '3': 17, '4': 1, '5': 9, '10': 'Reason'},
-    {'1': 'InstructionAck', '3': 18, '4': 1, '5': 8, '10': 'InstructionAck'},
-  ],
-  '7': {},
-};
-
-/// Descriptor for `AppointmentPayload`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List appointmentPayloadDescriptor = $convert.base64Decode(
-    'ChJBcHBvaW50bWVudFBheWxvYWQSPgoPQXBwb2ludG1lbnRUeXBlGAEgASgOMhQuYXBpLkFwcG'
-    '9pbnRtZW50VHlwZVIPQXBwb2ludG1lbnRUeXBlEjEKC0NvbW1pc3Npb25zGAIgAygLMg8uYXBp'
-    'LkNvbW1pc3Npb25SC0NvbW1pc3Npb25zElIKFlNlZ21lbnRhdGlvblNlbGVjdGlvbnMYBCADKA'
-    'syGi5hcGkuU2VnbWVudGF0aW9uU2VsZWN0aW9uUhZTZWdtZW50YXRpb25TZWxlY3Rpb25zElAK'
-    'EkNhcnJpZXJJbmZvcm1hdGlvbhgFIAMoCzIgLmFwaS5DYXJyaWVySW5mb3JtYXRpb25XaXRoVm'
-    'FsdWVSEkNhcnJpZXJJbmZvcm1hdGlvbhIdCgRTbG90GAYgASgLMgkuYXBpLlNsb3RSBFNsb3QS'
-    'fQoGRW1haWxzGAcgAygJQmWSQVEyHU11c3QgYmUgYSB2YWxpZCBlbWFpbCBhZGRyZXNzSjBbIk'
-    'pvaG4uZG9lQHJlZmxleC5jb20iLCAid2lsbC5zbWl0aEByZWZsZXguY29tIl36Qg6SAQsIASIH'
-    'cgVgAfABAVIGRW1haWxzEjwKDVJlbW92ZWRFbWFpbHMYECADKAlCFpJBAkAB8sEYDUVtYWlsc1'
-    'JlbW92ZWRSDVJlbW92ZWRFbWFpbHMSZQoGU3RhdHVzGAggASgLMhwuYXBpLkFwcG9pbnRtZW50'
-    'U3RhdHVzU3RydWN0Qi+SQRsyGVN0YXR1cyBvZiB0aGUgYXBwb2ludG1lbnTywRgNU3RhdHVzVX'
-    'BkYXRlZFIGU3RhdHVzEjsKDENyZWF0aW9uRGF0ZRgJIAEoCUIX+kIFcgPQAQHawhgLCgkKASoS'
-    'BGRhdGVSDENyZWF0aW9uRGF0ZRLHAQoITWV0YURhdGEYCiADKAsyFC5hcGkuTWV0YWRhdGFFbG'
-    'VtZW50QpQBkkGFATKCAU1ldGFkYXRhIGFyZSBjaGFyYWN0ZXJpc3RpY3Mgc3BlY2lmaWMgdG8g'
-    'dGhlIHNpdGUuIFRoZXkgY2FuIGJlIG9mIHNldmVyYWwgZGF0YSBmb3JtIChzdHJpbmcsIGludG'
-    'VnZXIsIGZsb2F0LCBib29sZWFuIG9yIHRpbWVzdGFtcCnAwRgB6sEYA0tleVIITWV0YURhdGES'
-    'HAoJQ2FycmllcklEGAsgASgJUglDYXJyaWVySUQSIAoLQ2Fycmllck5hbWUYDCABKAlSC0Nhcn'
-    'JpZXJOYW1lEoIBCgtBdHRhY2htZW50cxgNIAMoCzIWLmFwaS5BdHRhY2htZW50U3VtbWFyeUJI'
-    'kkEgMh5OdW1iZXIgb2YgYXR0YWNobWVudHMgcGVyIHR5cGXywRghQXR0YWNobWVudEFkZGVkLE'
-    'F0dGFjaG1lbnRSZW1vdmVkUgtBdHRhY2htZW50cxJMChBBdHRhY2htZW50TnVtYmVyGA4gASgF'
-    'QiCSQR0yG1RvdGFsIG51bWJlciBvZiBhdHRhY2htZW50c1IQQXR0YWNobWVudE51bWJlchIkCg'
-    '1IYXNDb21taXNzaW9uGA8gASgIUg1IYXNDb21taXNzaW9uEhYKBlJlYXNvbhgRIAEoCVIGUmVh'
-    'c29uEiYKDkluc3RydWN0aW9uQWNrGBIgASgIUg5JbnN0cnVjdGlvbkFjazonkkEkCiLSAQ9BcH'
-    'BvaW50bWVudFR5cGXSAQ1TZWdtZW50YXRpb25z');
-
-@$core.Deprecated('Use appointmentTripletDescriptor instead')
-const AppointmentTriplet$json = {
-  '1': 'AppointmentTriplet',
-  '2': [
-    {'1': 'Current', '3': 1, '4': 1, '5': 11, '6': '.api.Appointment', '10': 'Current'},
-    {'1': 'Previous', '3': 2, '4': 1, '5': 11, '6': '.api.Appointment', '10': 'Previous'},
-    {'1': 'LastEvent', '3': 3, '4': 1, '5': 11, '6': '.api.Appointment', '10': 'LastEvent'},
-  ],
-};
-
-/// Descriptor for `AppointmentTriplet`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List appointmentTripletDescriptor = $convert.base64Decode(
-    'ChJBcHBvaW50bWVudFRyaXBsZXQSKgoHQ3VycmVudBgBIAEoCzIQLmFwaS5BcHBvaW50bWVudF'
-    'IHQ3VycmVudBIsCghQcmV2aW91cxgCIAEoCzIQLmFwaS5BcHBvaW50bWVudFIIUHJldmlvdXMS'
-    'LgoJTGFzdEV2ZW50GAMgASgLMhAuYXBpLkFwcG9pbnRtZW50UglMYXN0RXZlbnQ=');
-
--- a/lib/appointmentAction.pb.dart
+++ b/lib/appointmentAction.pb.dart
@@ -1,16 +0,0 @@
-// This is a generated file - do not edit.
-//
-// Generated from appointmentAction.proto.
-
-// @dart = 3.3
-
-// ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
-
-import 'dart:core' as $core;
-
-export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
-
--- a/lib/appointmentAction.pbenum.dart
+++ b/lib/appointmentAction.pbenum.dart
@@ -1,12 +0,0 @@
-// This is a generated file - do not edit.
-//
-// Generated from appointmentAction.proto.
-
-// @dart = 3.3
-
-// ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
-
--- a/lib/appointmentAction.pbjson.dart
+++ b/lib/appointmentAction.pbjson.dart
@@ -1,16 +0,0 @@
-// This is a generated file - do not edit.
-//
-// Generated from appointmentAction.proto.
-
-// @dart = 3.3
-
-// ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
-
-import 'dart:convert' as $convert;
-import 'dart:core' as $core;
-import 'dart:typed_data' as $typed_data;
-
--- a/lib/appointmentInput.pb.dart
+++ b/lib/appointmentInput.pb.dart
--- a/lib/appointmentInput.pbenum.dart
+++ b/lib/appointmentInput.pbenum.dart
@@ -1,12 +0,0 @@
-// This is a generated file - do not edit.
-//
-// Generated from appointmentInput.proto.
-
-// @dart = 3.3
-
-// ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
-
--- a/lib/appointmentInput.pbgrpc.dart
+++ b/lib/appointmentInput.pbgrpc.dart
@@ -1,405 +0,0 @@
-// This is a generated file - do not edit.
-//
-// Generated from appointmentInput.proto.
-
-// @dart = 3.3
-
-// ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
-
-import 'dart:async' as $async;
-import 'dart:core' as $core;
-
-import 'package:grpc/service_api.dart' as $grpc;
-import 'package:protobuf/protobuf.dart' as $pb;
-
-import 'appointmentInput.pb.dart' as $0;
-
-export 'appointmentInput.pb.dart';
-
-///
-/// API-server services
-@$pb.GrpcServiceName('api.AppointmentInputAPI')
-class AppointmentInputAPIClient extends $grpc.Client {
-  /// The hostname for this service.
-  static const $core.String defaultHost = '';
-
-  /// OAuth scopes needed for the client.
-  static const $core.List<$core.String> oauthScopes = [
-    '',
-  ];
-
-  AppointmentInputAPIClient(super.channel, {super.options, super.interceptors});
-
-  $grpc.ResponseFuture<$0.AppointmentCreatedResponse> created($0.AppointmentCreatedRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$created, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.AppointmentCanceledResponse> canceled($0.AppointmentCanceledRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$canceled, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.AppointmentDateUpdatedResponse> dateUpdated($0.AppointmentDateUpdatedRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$dateUpdated, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.AppointmentCommissionsUpdatedResponse> commissionsUpdated($0.AppointmentCommissionsUpdatedRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$commissionsUpdated, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.AppointmentCarrierInformationUpdatedResponse> carrierInformationUpdated($0.AppointmentCarrierInformationUpdatedRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$carrierInformationUpdated, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.AppointmentCarrierExpectedResponse> carrierExpected($0.AppointmentCarrierExpectedRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$carrierExpected, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.AppointmentCarrierArrivedResponse> carrierArrived($0.AppointmentCarrierArrivedRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$carrierArrived, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.AppointmentExpeditionStartedResponse> expeditionStarted($0.AppointmentExpeditionStartedRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$expeditionStarted, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.AppointmentExpeditionLoadedResponse> expeditionLoaded($0.AppointmentExpeditionLoadedRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$expeditionLoaded, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.AppointmentReceptionStartedResponse> receptionStarted($0.AppointmentReceptionStartedRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$receptionStarted, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.AppointmentReceptionUnloadedResponse> receptionUnloaded($0.AppointmentReceptionUnloadedRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$receptionUnloaded, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.AppointmentCarrierDepartedResponse> carrierDeparted($0.AppointmentCarrierDepartedRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$carrierDeparted, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.AppointmentMetaDataUpdatedResponse> metaDataUpdated($0.AppointmentMetaDataUpdatedRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$metaDataUpdated, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.AppointmentAttachmentAddedResponse> attachmentAdded($0.AppointmentAttachmentAddedRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$attachmentAdded, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.AppointmentAttachmentRemovedResponse> attachmentRemoved($0.AppointmentAttachmentRemovedRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$attachmentRemoved, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.AppointmentEmailsAddedResponse> emailsAdded($0.AppointmentEmailsAddedRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$emailsAdded, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.AppointmentEmailsRemovedResponse> emailsRemoved($0.AppointmentEmailsRemovedRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$emailsRemoved, request, options: options);
-  }
-
-    // method descriptors
-
-  static final _$created = $grpc.ClientMethod<$0.AppointmentCreatedRequest, $0.AppointmentCreatedResponse>(
-      '/api.AppointmentInputAPI/Created',
-      ($0.AppointmentCreatedRequest value) => value.writeToBuffer(),
-      $0.AppointmentCreatedResponse.fromBuffer);
-  static final _$canceled = $grpc.ClientMethod<$0.AppointmentCanceledRequest, $0.AppointmentCanceledResponse>(
-      '/api.AppointmentInputAPI/Canceled',
-      ($0.AppointmentCanceledRequest value) => value.writeToBuffer(),
-      $0.AppointmentCanceledResponse.fromBuffer);
-  static final _$dateUpdated = $grpc.ClientMethod<$0.AppointmentDateUpdatedRequest, $0.AppointmentDateUpdatedResponse>(
-      '/api.AppointmentInputAPI/DateUpdated',
-      ($0.AppointmentDateUpdatedRequest value) => value.writeToBuffer(),
-      $0.AppointmentDateUpdatedResponse.fromBuffer);
-  static final _$commissionsUpdated = $grpc.ClientMethod<$0.AppointmentCommissionsUpdatedRequest, $0.AppointmentCommissionsUpdatedResponse>(
-      '/api.AppointmentInputAPI/CommissionsUpdated',
-      ($0.AppointmentCommissionsUpdatedRequest value) => value.writeToBuffer(),
-      $0.AppointmentCommissionsUpdatedResponse.fromBuffer);
-  static final _$carrierInformationUpdated = $grpc.ClientMethod<$0.AppointmentCarrierInformationUpdatedRequest, $0.AppointmentCarrierInformationUpdatedResponse>(
-      '/api.AppointmentInputAPI/CarrierInformationUpdated',
-      ($0.AppointmentCarrierInformationUpdatedRequest value) => value.writeToBuffer(),
-      $0.AppointmentCarrierInformationUpdatedResponse.fromBuffer);
-  static final _$carrierExpected = $grpc.ClientMethod<$0.AppointmentCarrierExpectedRequest, $0.AppointmentCarrierExpectedResponse>(
-      '/api.AppointmentInputAPI/CarrierExpected',
-      ($0.AppointmentCarrierExpectedRequest value) => value.writeToBuffer(),
-      $0.AppointmentCarrierExpectedResponse.fromBuffer);
-  static final _$carrierArrived = $grpc.ClientMethod<$0.AppointmentCarrierArrivedRequest, $0.AppointmentCarrierArrivedResponse>(
-      '/api.AppointmentInputAPI/CarrierArrived',
-      ($0.AppointmentCarrierArrivedRequest value) => value.writeToBuffer(),
-      $0.AppointmentCarrierArrivedResponse.fromBuffer);
-  static final _$expeditionStarted = $grpc.ClientMethod<$0.AppointmentExpeditionStartedRequest, $0.AppointmentExpeditionStartedResponse>(
-      '/api.AppointmentInputAPI/ExpeditionStarted',
-      ($0.AppointmentExpeditionStartedRequest value) => value.writeToBuffer(),
-      $0.AppointmentExpeditionStartedResponse.fromBuffer);
-  static final _$expeditionLoaded = $grpc.ClientMethod<$0.AppointmentExpeditionLoadedRequest, $0.AppointmentExpeditionLoadedResponse>(
-      '/api.AppointmentInputAPI/ExpeditionLoaded',
-      ($0.AppointmentExpeditionLoadedRequest value) => value.writeToBuffer(),
-      $0.AppointmentExpeditionLoadedResponse.fromBuffer);
-  static final _$receptionStarted = $grpc.ClientMethod<$0.AppointmentReceptionStartedRequest, $0.AppointmentReceptionStartedResponse>(
-      '/api.AppointmentInputAPI/ReceptionStarted',
-      ($0.AppointmentReceptionStartedRequest value) => value.writeToBuffer(),
-      $0.AppointmentReceptionStartedResponse.fromBuffer);
-  static final _$receptionUnloaded = $grpc.ClientMethod<$0.AppointmentReceptionUnloadedRequest, $0.AppointmentReceptionUnloadedResponse>(
-      '/api.AppointmentInputAPI/ReceptionUnloaded',
-      ($0.AppointmentReceptionUnloadedRequest value) => value.writeToBuffer(),
-      $0.AppointmentReceptionUnloadedResponse.fromBuffer);
-  static final _$carrierDeparted = $grpc.ClientMethod<$0.AppointmentCarrierDepartedRequest, $0.AppointmentCarrierDepartedResponse>(
-      '/api.AppointmentInputAPI/CarrierDeparted',
-      ($0.AppointmentCarrierDepartedRequest value) => value.writeToBuffer(),
-      $0.AppointmentCarrierDepartedResponse.fromBuffer);
-  static final _$metaDataUpdated = $grpc.ClientMethod<$0.AppointmentMetaDataUpdatedRequest, $0.AppointmentMetaDataUpdatedResponse>(
-      '/api.AppointmentInputAPI/MetaDataUpdated',
-      ($0.AppointmentMetaDataUpdatedRequest value) => value.writeToBuffer(),
-      $0.AppointmentMetaDataUpdatedResponse.fromBuffer);
-  static final _$attachmentAdded = $grpc.ClientMethod<$0.AppointmentAttachmentAddedRequest, $0.AppointmentAttachmentAddedResponse>(
-      '/api.AppointmentInputAPI/AttachmentAdded',
-      ($0.AppointmentAttachmentAddedRequest value) => value.writeToBuffer(),
-      $0.AppointmentAttachmentAddedResponse.fromBuffer);
-  static final _$attachmentRemoved = $grpc.ClientMethod<$0.AppointmentAttachmentRemovedRequest, $0.AppointmentAttachmentRemovedResponse>(
-      '/api.AppointmentInputAPI/AttachmentRemoved',
-      ($0.AppointmentAttachmentRemovedRequest value) => value.writeToBuffer(),
-      $0.AppointmentAttachmentRemovedResponse.fromBuffer);
-  static final _$emailsAdded = $grpc.ClientMethod<$0.AppointmentEmailsAddedRequest, $0.AppointmentEmailsAddedResponse>(
-      '/api.AppointmentInputAPI/EmailsAdded',
-      ($0.AppointmentEmailsAddedRequest value) => value.writeToBuffer(),
-      $0.AppointmentEmailsAddedResponse.fromBuffer);
-  static final _$emailsRemoved = $grpc.ClientMethod<$0.AppointmentEmailsRemovedRequest, $0.AppointmentEmailsRemovedResponse>(
-      '/api.AppointmentInputAPI/EmailsRemoved',
-      ($0.AppointmentEmailsRemovedRequest value) => value.writeToBuffer(),
-      $0.AppointmentEmailsRemovedResponse.fromBuffer);
-}
-
-@$pb.GrpcServiceName('api.AppointmentInputAPI')
-abstract class AppointmentInputAPIServiceBase extends $grpc.Service {
-  $core.String get $name => 'api.AppointmentInputAPI';
-
-  AppointmentInputAPIServiceBase() {
-    $addMethod($grpc.ServiceMethod<$0.AppointmentCreatedRequest, $0.AppointmentCreatedResponse>(
-        'Created',
-        created_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $0.AppointmentCreatedRequest.fromBuffer(value),
-        ($0.AppointmentCreatedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.AppointmentCanceledRequest, $0.AppointmentCanceledResponse>(
-        'Canceled',
-        canceled_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $0.AppointmentCanceledRequest.fromBuffer(value),
-        ($0.AppointmentCanceledResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.AppointmentDateUpdatedRequest, $0.AppointmentDateUpdatedResponse>(
-        'DateUpdated',
-        dateUpdated_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $0.AppointmentDateUpdatedRequest.fromBuffer(value),
-        ($0.AppointmentDateUpdatedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.AppointmentCommissionsUpdatedRequest, $0.AppointmentCommissionsUpdatedResponse>(
-        'CommissionsUpdated',
-        commissionsUpdated_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $0.AppointmentCommissionsUpdatedRequest.fromBuffer(value),
-        ($0.AppointmentCommissionsUpdatedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.AppointmentCarrierInformationUpdatedRequest, $0.AppointmentCarrierInformationUpdatedResponse>(
-        'CarrierInformationUpdated',
-        carrierInformationUpdated_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $0.AppointmentCarrierInformationUpdatedRequest.fromBuffer(value),
-        ($0.AppointmentCarrierInformationUpdatedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.AppointmentCarrierExpectedRequest, $0.AppointmentCarrierExpectedResponse>(
-        'CarrierExpected',
-        carrierExpected_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $0.AppointmentCarrierExpectedRequest.fromBuffer(value),
-        ($0.AppointmentCarrierExpectedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.AppointmentCarrierArrivedRequest, $0.AppointmentCarrierArrivedResponse>(
-        'CarrierArrived',
-        carrierArrived_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $0.AppointmentCarrierArrivedRequest.fromBuffer(value),
-        ($0.AppointmentCarrierArrivedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.AppointmentExpeditionStartedRequest, $0.AppointmentExpeditionStartedResponse>(
-        'ExpeditionStarted',
-        expeditionStarted_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $0.AppointmentExpeditionStartedRequest.fromBuffer(value),
-        ($0.AppointmentExpeditionStartedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.AppointmentExpeditionLoadedRequest, $0.AppointmentExpeditionLoadedResponse>(
-        'ExpeditionLoaded',
-        expeditionLoaded_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $0.AppointmentExpeditionLoadedRequest.fromBuffer(value),
-        ($0.AppointmentExpeditionLoadedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.AppointmentReceptionStartedRequest, $0.AppointmentReceptionStartedResponse>(
-        'ReceptionStarted',
-        receptionStarted_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $0.AppointmentReceptionStartedRequest.fromBuffer(value),
-        ($0.AppointmentReceptionStartedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.AppointmentReceptionUnloadedRequest, $0.AppointmentReceptionUnloadedResponse>(
-        'ReceptionUnloaded',
-        receptionUnloaded_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $0.AppointmentReceptionUnloadedRequest.fromBuffer(value),
-        ($0.AppointmentReceptionUnloadedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.AppointmentCarrierDepartedRequest, $0.AppointmentCarrierDepartedResponse>(
-        'CarrierDeparted',
-        carrierDeparted_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $0.AppointmentCarrierDepartedRequest.fromBuffer(value),
-        ($0.AppointmentCarrierDepartedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.AppointmentMetaDataUpdatedRequest, $0.AppointmentMetaDataUpdatedResponse>(
-        'MetaDataUpdated',
-        metaDataUpdated_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $0.AppointmentMetaDataUpdatedRequest.fromBuffer(value),
-        ($0.AppointmentMetaDataUpdatedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.AppointmentAttachmentAddedRequest, $0.AppointmentAttachmentAddedResponse>(
-        'AttachmentAdded',
-        attachmentAdded_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $0.AppointmentAttachmentAddedRequest.fromBuffer(value),
-        ($0.AppointmentAttachmentAddedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.AppointmentAttachmentRemovedRequest, $0.AppointmentAttachmentRemovedResponse>(
-        'AttachmentRemoved',
-        attachmentRemoved_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $0.AppointmentAttachmentRemovedRequest.fromBuffer(value),
-        ($0.AppointmentAttachmentRemovedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.AppointmentEmailsAddedRequest, $0.AppointmentEmailsAddedResponse>(
-        'EmailsAdded',
-        emailsAdded_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $0.AppointmentEmailsAddedRequest.fromBuffer(value),
-        ($0.AppointmentEmailsAddedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.AppointmentEmailsRemovedRequest, $0.AppointmentEmailsRemovedResponse>(
-        'EmailsRemoved',
-        emailsRemoved_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $0.AppointmentEmailsRemovedRequest.fromBuffer(value),
-        ($0.AppointmentEmailsRemovedResponse value) => value.writeToBuffer()));
-  }
-
-  $async.Future<$0.AppointmentCreatedResponse> created_Pre($grpc.ServiceCall $call, $async.Future<$0.AppointmentCreatedRequest> $request) async {
-    return created($call, await $request);
-  }
-
-  $async.Future<$0.AppointmentCreatedResponse> created($grpc.ServiceCall call, $0.AppointmentCreatedRequest request);
-
-  $async.Future<$0.AppointmentCanceledResponse> canceled_Pre($grpc.ServiceCall $call, $async.Future<$0.AppointmentCanceledRequest> $request) async {
-    return canceled($call, await $request);
-  }
-
-  $async.Future<$0.AppointmentCanceledResponse> canceled($grpc.ServiceCall call, $0.AppointmentCanceledRequest request);
-
-  $async.Future<$0.AppointmentDateUpdatedResponse> dateUpdated_Pre($grpc.ServiceCall $call, $async.Future<$0.AppointmentDateUpdatedRequest> $request) async {
-    return dateUpdated($call, await $request);
-  }
-
-  $async.Future<$0.AppointmentDateUpdatedResponse> dateUpdated($grpc.ServiceCall call, $0.AppointmentDateUpdatedRequest request);
-
-  $async.Future<$0.AppointmentCommissionsUpdatedResponse> commissionsUpdated_Pre($grpc.ServiceCall $call, $async.Future<$0.AppointmentCommissionsUpdatedRequest> $request) async {
-    return commissionsUpdated($call, await $request);
-  }
-
-  $async.Future<$0.AppointmentCommissionsUpdatedResponse> commissionsUpdated($grpc.ServiceCall call, $0.AppointmentCommissionsUpdatedRequest request);
-
-  $async.Future<$0.AppointmentCarrierInformationUpdatedResponse> carrierInformationUpdated_Pre($grpc.ServiceCall $call, $async.Future<$0.AppointmentCarrierInformationUpdatedRequest> $request) async {
-    return carrierInformationUpdated($call, await $request);
-  }
-
-  $async.Future<$0.AppointmentCarrierInformationUpdatedResponse> carrierInformationUpdated($grpc.ServiceCall call, $0.AppointmentCarrierInformationUpdatedRequest request);
-
-  $async.Future<$0.AppointmentCarrierExpectedResponse> carrierExpected_Pre($grpc.ServiceCall $call, $async.Future<$0.AppointmentCarrierExpectedRequest> $request) async {
-    return carrierExpected($call, await $request);
-  }
-
-  $async.Future<$0.AppointmentCarrierExpectedResponse> carrierExpected($grpc.ServiceCall call, $0.AppointmentCarrierExpectedRequest request);
-
-  $async.Future<$0.AppointmentCarrierArrivedResponse> carrierArrived_Pre($grpc.ServiceCall $call, $async.Future<$0.AppointmentCarrierArrivedRequest> $request) async {
-    return carrierArrived($call, await $request);
-  }
-
-  $async.Future<$0.AppointmentCarrierArrivedResponse> carrierArrived($grpc.ServiceCall call, $0.AppointmentCarrierArrivedRequest request);
-
-  $async.Future<$0.AppointmentExpeditionStartedResponse> expeditionStarted_Pre($grpc.ServiceCall $call, $async.Future<$0.AppointmentExpeditionStartedRequest> $request) async {
-    return expeditionStarted($call, await $request);
-  }
-
-  $async.Future<$0.AppointmentExpeditionStartedResponse> expeditionStarted($grpc.ServiceCall call, $0.AppointmentExpeditionStartedRequest request);
-
-  $async.Future<$0.AppointmentExpeditionLoadedResponse> expeditionLoaded_Pre($grpc.ServiceCall $call, $async.Future<$0.AppointmentExpeditionLoadedRequest> $request) async {
-    return expeditionLoaded($call, await $request);
-  }
-
-  $async.Future<$0.AppointmentExpeditionLoadedResponse> expeditionLoaded($grpc.ServiceCall call, $0.AppointmentExpeditionLoadedRequest request);
-
-  $async.Future<$0.AppointmentReceptionStartedResponse> receptionStarted_Pre($grpc.ServiceCall $call, $async.Future<$0.AppointmentReceptionStartedRequest> $request) async {
-    return receptionStarted($call, await $request);
-  }
-
-  $async.Future<$0.AppointmentReceptionStartedResponse> receptionStarted($grpc.ServiceCall call, $0.AppointmentReceptionStartedRequest request);
-
-  $async.Future<$0.AppointmentReceptionUnloadedResponse> receptionUnloaded_Pre($grpc.ServiceCall $call, $async.Future<$0.AppointmentReceptionUnloadedRequest> $request) async {
-    return receptionUnloaded($call, await $request);
-  }
-
-  $async.Future<$0.AppointmentReceptionUnloadedResponse> receptionUnloaded($grpc.ServiceCall call, $0.AppointmentReceptionUnloadedRequest request);
-
-  $async.Future<$0.AppointmentCarrierDepartedResponse> carrierDeparted_Pre($grpc.ServiceCall $call, $async.Future<$0.AppointmentCarrierDepartedRequest> $request) async {
-    return carrierDeparted($call, await $request);
-  }
-
-  $async.Future<$0.AppointmentCarrierDepartedResponse> carrierDeparted($grpc.ServiceCall call, $0.AppointmentCarrierDepartedRequest request);
-
-  $async.Future<$0.AppointmentMetaDataUpdatedResponse> metaDataUpdated_Pre($grpc.ServiceCall $call, $async.Future<$0.AppointmentMetaDataUpdatedRequest> $request) async {
-    return metaDataUpdated($call, await $request);
-  }
-
-  $async.Future<$0.AppointmentMetaDataUpdatedResponse> metaDataUpdated($grpc.ServiceCall call, $0.AppointmentMetaDataUpdatedRequest request);
-
-  $async.Future<$0.AppointmentAttachmentAddedResponse> attachmentAdded_Pre($grpc.ServiceCall $call, $async.Future<$0.AppointmentAttachmentAddedRequest> $request) async {
-    return attachmentAdded($call, await $request);
-  }
-
-  $async.Future<$0.AppointmentAttachmentAddedResponse> attachmentAdded($grpc.ServiceCall call, $0.AppointmentAttachmentAddedRequest request);
-
-  $async.Future<$0.AppointmentAttachmentRemovedResponse> attachmentRemoved_Pre($grpc.ServiceCall $call, $async.Future<$0.AppointmentAttachmentRemovedRequest> $request) async {
-    return attachmentRemoved($call, await $request);
-  }
-
-  $async.Future<$0.AppointmentAttachmentRemovedResponse> attachmentRemoved($grpc.ServiceCall call, $0.AppointmentAttachmentRemovedRequest request);
-
-  $async.Future<$0.AppointmentEmailsAddedResponse> emailsAdded_Pre($grpc.ServiceCall $call, $async.Future<$0.AppointmentEmailsAddedRequest> $request) async {
-    return emailsAdded($call, await $request);
-  }
-
-  $async.Future<$0.AppointmentEmailsAddedResponse> emailsAdded($grpc.ServiceCall call, $0.AppointmentEmailsAddedRequest request);
-
-  $async.Future<$0.AppointmentEmailsRemovedResponse> emailsRemoved_Pre($grpc.ServiceCall $call, $async.Future<$0.AppointmentEmailsRemovedRequest> $request) async {
-    return emailsRemoved($call, await $request);
-  }
-
-  $async.Future<$0.AppointmentEmailsRemovedResponse> emailsRemoved($grpc.ServiceCall call, $0.AppointmentEmailsRemovedRequest request);
-
-}
--- a/lib/appointmentInput.pbjson.dart
+++ b/lib/appointmentInput.pbjson.dart
--- a/lib/appointmentQuery.pb.dart
+++ b/lib/appointmentQuery.pb.dart
@@ -1,438 +0,0 @@
-// This is a generated file - do not edit.
-//
-// Generated from appointmentQuery.proto.
-
-// @dart = 3.3
-
-// ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
-
-import 'dart:core' as $core;
-
-import 'package:protobuf/protobuf.dart' as $pb;
-
-import 'appointment.pb.dart' as $3;
-import 'shared.pb.dart' as $1;
-
-export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
-
-class AppointmentByIdQuery extends $pb.GeneratedMessage {
-  factory AppointmentByIdQuery({
-    $1.QuerySiteHeader? header,
-    $core.Iterable<$1.EntityID>? iDs,
-    AppointmentQueryOptions? options,
-  }) {
-    final result = create();
-    if (header != null) result.header = header;
-    if (iDs != null) result.iDs.addAll(iDs);
-    if (options != null) result.options = options;
-    return result;
-  }
-
-  AppointmentByIdQuery._();
-
-  factory AppointmentByIdQuery.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory AppointmentByIdQuery.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'AppointmentByIdQuery', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$1.QuerySiteHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.QuerySiteHeader.create)
-    ..pc<$1.EntityID>(2, _omitFieldNames ? '' : 'IDs', $pb.PbFieldType.PM, protoName: 'IDs', subBuilder: $1.EntityID.create)
-    ..aOM<AppointmentQueryOptions>(3, _omitFieldNames ? '' : 'Options', protoName: 'Options', subBuilder: AppointmentQueryOptions.create)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  AppointmentByIdQuery clone() => AppointmentByIdQuery()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  AppointmentByIdQuery copyWith(void Function(AppointmentByIdQuery) updates) => super.copyWith((message) => updates(message as AppointmentByIdQuery)) as AppointmentByIdQuery;
-
-  @$core.override
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static AppointmentByIdQuery create() => AppointmentByIdQuery._();
-  @$core.override
-  AppointmentByIdQuery createEmptyInstance() => create();
-  static $pb.PbList<AppointmentByIdQuery> createRepeated() => $pb.PbList<AppointmentByIdQuery>();
-  @$core.pragma('dart2js:noInline')
-  static AppointmentByIdQuery getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<AppointmentByIdQuery>(create);
-  static AppointmentByIdQuery? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  $1.QuerySiteHeader get header => $_getN(0);
-  @$pb.TagNumber(1)
-  set header($1.QuerySiteHeader value) => $_setField(1, value);
-  @$pb.TagNumber(1)
-  $core.bool hasHeader() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearHeader() => $_clearField(1);
-  @$pb.TagNumber(1)
-  $1.QuerySiteHeader ensureHeader() => $_ensure(0);
-
-  @$pb.TagNumber(2)
-  $pb.PbList<$1.EntityID> get iDs => $_getList(1);
-
-  @$pb.TagNumber(3)
-  AppointmentQueryOptions get options => $_getN(2);
-  @$pb.TagNumber(3)
-  set options(AppointmentQueryOptions value) => $_setField(3, value);
-  @$pb.TagNumber(3)
-  $core.bool hasOptions() => $_has(2);
-  @$pb.TagNumber(3)
-  void clearOptions() => $_clearField(3);
-  @$pb.TagNumber(3)
-  AppointmentQueryOptions ensureOptions() => $_ensure(2);
-}
-
-class AppointmentByIdResult extends $pb.GeneratedMessage {
-  factory AppointmentByIdResult({
-    $1.ResultHeader? header,
-    $core.Iterable<$3.Appointment>? objects,
-  }) {
-    final result = create();
-    if (header != null) result.header = header;
-    if (objects != null) result.objects.addAll(objects);
-    return result;
-  }
-
-  AppointmentByIdResult._();
-
-  factory AppointmentByIdResult.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory AppointmentByIdResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'AppointmentByIdResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$1.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.ResultHeader.create)
-    ..pc<$3.Appointment>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $3.Appointment.create)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  AppointmentByIdResult clone() => AppointmentByIdResult()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  AppointmentByIdResult copyWith(void Function(AppointmentByIdResult) updates) => super.copyWith((message) => updates(message as AppointmentByIdResult)) as AppointmentByIdResult;
-
-  @$core.override
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static AppointmentByIdResult create() => AppointmentByIdResult._();
-  @$core.override
-  AppointmentByIdResult createEmptyInstance() => create();
-  static $pb.PbList<AppointmentByIdResult> createRepeated() => $pb.PbList<AppointmentByIdResult>();
-  @$core.pragma('dart2js:noInline')
-  static AppointmentByIdResult getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<AppointmentByIdResult>(create);
-  static AppointmentByIdResult? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  $1.ResultHeader get header => $_getN(0);
-  @$pb.TagNumber(1)
-  set header($1.ResultHeader value) => $_setField(1, value);
-  @$pb.TagNumber(1)
-  $core.bool hasHeader() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearHeader() => $_clearField(1);
-  @$pb.TagNumber(1)
-  $1.ResultHeader ensureHeader() => $_ensure(0);
-
-  @$pb.TagNumber(2)
-  $pb.PbList<$3.Appointment> get objects => $_getList(1);
-}
-
-class AppointmentByFilterQuery extends $pb.GeneratedMessage {
-  factory AppointmentByFilterQuery({
-    $1.QuerySiteHeader? header,
-    $core.String? limitFilter,
-    $core.String? queryContext,
-    $core.Iterable<$1.BlockFilter>? blockFilters,
-    AppointmentQueryOptions? options,
-  }) {
-    final result = create();
-    if (header != null) result.header = header;
-    if (limitFilter != null) result.limitFilter = limitFilter;
-    if (queryContext != null) result.queryContext = queryContext;
-    if (blockFilters != null) result.blockFilters.addAll(blockFilters);
-    if (options != null) result.options = options;
-    return result;
-  }
-
-  AppointmentByFilterQuery._();
-
-  factory AppointmentByFilterQuery.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory AppointmentByFilterQuery.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'AppointmentByFilterQuery', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$1.QuerySiteHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.QuerySiteHeader.create)
-    ..aOS(4, _omitFieldNames ? '' : 'limitFilter', protoName: 'limitFilter')
-    ..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)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  AppointmentByFilterQuery clone() => AppointmentByFilterQuery()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  AppointmentByFilterQuery copyWith(void Function(AppointmentByFilterQuery) updates) => super.copyWith((message) => updates(message as AppointmentByFilterQuery)) as AppointmentByFilterQuery;
-
-  @$core.override
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static AppointmentByFilterQuery create() => AppointmentByFilterQuery._();
-  @$core.override
-  AppointmentByFilterQuery createEmptyInstance() => create();
-  static $pb.PbList<AppointmentByFilterQuery> createRepeated() => $pb.PbList<AppointmentByFilterQuery>();
-  @$core.pragma('dart2js:noInline')
-  static AppointmentByFilterQuery getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<AppointmentByFilterQuery>(create);
-  static AppointmentByFilterQuery? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  $1.QuerySiteHeader get header => $_getN(0);
-  @$pb.TagNumber(1)
-  set header($1.QuerySiteHeader value) => $_setField(1, value);
-  @$pb.TagNumber(1)
-  $core.bool hasHeader() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearHeader() => $_clearField(1);
-  @$pb.TagNumber(1)
-  $1.QuerySiteHeader ensureHeader() => $_ensure(0);
-
-  /// Number of maximum result
-  @$pb.TagNumber(4)
-  $core.String get limitFilter => $_getSZ(1);
-  @$pb.TagNumber(4)
-  set limitFilter($core.String value) => $_setString(1, value);
-  @$pb.TagNumber(4)
-  $core.bool hasLimitFilter() => $_has(1);
-  @$pb.TagNumber(4)
-  void clearLimitFilter() => $_clearField(4);
-
-  @$pb.TagNumber(5)
-  $core.String get queryContext => $_getSZ(2);
-  @$pb.TagNumber(5)
-  set queryContext($core.String value) => $_setString(2, value);
-  @$pb.TagNumber(5)
-  $core.bool hasQueryContext() => $_has(2);
-  @$pb.TagNumber(5)
-  void clearQueryContext() => $_clearField(5);
-
-  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query, if not empty, simpleFilters (deprecated) & rangeFilters (deprecated) will be ignored
-  @$pb.TagNumber(6)
-  $pb.PbList<$1.BlockFilter> get blockFilters => $_getList(3);
-
-  @$pb.TagNumber(7)
-  AppointmentQueryOptions get options => $_getN(4);
-  @$pb.TagNumber(7)
-  set options(AppointmentQueryOptions value) => $_setField(7, value);
-  @$pb.TagNumber(7)
-  $core.bool hasOptions() => $_has(4);
-  @$pb.TagNumber(7)
-  void clearOptions() => $_clearField(7);
-  @$pb.TagNumber(7)
-  AppointmentQueryOptions ensureOptions() => $_ensure(4);
-}
-
-class AppointmentByFilterResult extends $pb.GeneratedMessage {
-  factory AppointmentByFilterResult({
-    $1.ResultHeader? header,
-    $core.Iterable<$3.Appointment>? objects,
-    $core.String? queryContext,
-  }) {
-    final result = create();
-    if (header != null) result.header = header;
-    if (objects != null) result.objects.addAll(objects);
-    if (queryContext != null) result.queryContext = queryContext;
-    return result;
-  }
-
-  AppointmentByFilterResult._();
-
-  factory AppointmentByFilterResult.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory AppointmentByFilterResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'AppointmentByFilterResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$1.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.ResultHeader.create)
-    ..pc<$3.Appointment>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $3.Appointment.create)
-    ..aOS(3, _omitFieldNames ? '' : 'queryContext', protoName: 'queryContext')
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  AppointmentByFilterResult clone() => AppointmentByFilterResult()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  AppointmentByFilterResult copyWith(void Function(AppointmentByFilterResult) updates) => super.copyWith((message) => updates(message as AppointmentByFilterResult)) as AppointmentByFilterResult;
-
-  @$core.override
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static AppointmentByFilterResult create() => AppointmentByFilterResult._();
-  @$core.override
-  AppointmentByFilterResult createEmptyInstance() => create();
-  static $pb.PbList<AppointmentByFilterResult> createRepeated() => $pb.PbList<AppointmentByFilterResult>();
-  @$core.pragma('dart2js:noInline')
-  static AppointmentByFilterResult getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<AppointmentByFilterResult>(create);
-  static AppointmentByFilterResult? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  $1.ResultHeader get header => $_getN(0);
-  @$pb.TagNumber(1)
-  set header($1.ResultHeader value) => $_setField(1, value);
-  @$pb.TagNumber(1)
-  $core.bool hasHeader() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearHeader() => $_clearField(1);
-  @$pb.TagNumber(1)
-  $1.ResultHeader ensureHeader() => $_ensure(0);
-
-  @$pb.TagNumber(2)
-  $pb.PbList<$3.Appointment> get objects => $_getList(1);
-
-  @$pb.TagNumber(3)
-  $core.String get queryContext => $_getSZ(2);
-  @$pb.TagNumber(3)
-  set queryContext($core.String value) => $_setString(2, value);
-  @$pb.TagNumber(3)
-  $core.bool hasQueryContext() => $_has(2);
-  @$pb.TagNumber(3)
-  void clearQueryContext() => $_clearField(3);
-}
-
-class AppointmentQueryOptions extends $pb.GeneratedMessage {
-  factory AppointmentQueryOptions() => create();
-
-  AppointmentQueryOptions._();
-
-  factory AppointmentQueryOptions.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory AppointmentQueryOptions.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'AppointmentQueryOptions', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  AppointmentQueryOptions clone() => AppointmentQueryOptions()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  AppointmentQueryOptions copyWith(void Function(AppointmentQueryOptions) updates) => super.copyWith((message) => updates(message as AppointmentQueryOptions)) as AppointmentQueryOptions;
-
-  @$core.override
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static AppointmentQueryOptions create() => AppointmentQueryOptions._();
-  @$core.override
-  AppointmentQueryOptions createEmptyInstance() => create();
-  static $pb.PbList<AppointmentQueryOptions> createRepeated() => $pb.PbList<AppointmentQueryOptions>();
-  @$core.pragma('dart2js:noInline')
-  static AppointmentQueryOptions getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<AppointmentQueryOptions>(create);
-  static AppointmentQueryOptions? _defaultInstance;
-}
-
-class AppointmentByMatchQuery extends $pb.GeneratedMessage {
-  factory AppointmentByMatchQuery({
-    $1.QuerySiteHeader? header,
-    $core.Iterable<$1.BlockFilter>? blockFilters,
-    $core.Iterable<$1.MatchField>? matchFields,
-  }) {
-    final result = create();
-    if (header != null) result.header = header;
-    if (blockFilters != null) result.blockFilters.addAll(blockFilters);
-    if (matchFields != null) result.matchFields.addAll(matchFields);
-    return result;
-  }
-
-  AppointmentByMatchQuery._();
-
-  factory AppointmentByMatchQuery.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory AppointmentByMatchQuery.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'AppointmentByMatchQuery', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$1.QuerySiteHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.QuerySiteHeader.create)
-    ..pc<$1.BlockFilter>(5, _omitFieldNames ? '' : 'BlockFilters', $pb.PbFieldType.PM, protoName: 'BlockFilters', subBuilder: $1.BlockFilter.create)
-    ..pc<$1.MatchField>(6, _omitFieldNames ? '' : 'MatchFields', $pb.PbFieldType.PM, protoName: 'MatchFields', subBuilder: $1.MatchField.create)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  AppointmentByMatchQuery clone() => AppointmentByMatchQuery()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  AppointmentByMatchQuery copyWith(void Function(AppointmentByMatchQuery) updates) => super.copyWith((message) => updates(message as AppointmentByMatchQuery)) as AppointmentByMatchQuery;
-
-  @$core.override
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static AppointmentByMatchQuery create() => AppointmentByMatchQuery._();
-  @$core.override
-  AppointmentByMatchQuery createEmptyInstance() => create();
-  static $pb.PbList<AppointmentByMatchQuery> createRepeated() => $pb.PbList<AppointmentByMatchQuery>();
-  @$core.pragma('dart2js:noInline')
-  static AppointmentByMatchQuery getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<AppointmentByMatchQuery>(create);
-  static AppointmentByMatchQuery? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  $1.QuerySiteHeader get header => $_getN(0);
-  @$pb.TagNumber(1)
-  set header($1.QuerySiteHeader value) => $_setField(1, value);
-  @$pb.TagNumber(1)
-  $core.bool hasHeader() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearHeader() => $_clearField(1);
-  @$pb.TagNumber(1)
-  $1.QuerySiteHeader ensureHeader() => $_ensure(0);
-
-  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query, if not empty, simpleFilters (deprecated) & rangeFilters (deprecated) will be ignored
-  @$pb.TagNumber(5)
-  $pb.PbList<$1.BlockFilter> get blockFilters => $_getList(1);
-
-  /// MatchField list structure, for FindMatching query
-  @$pb.TagNumber(6)
-  $pb.PbList<$1.MatchField> get matchFields => $_getList(2);
-}
-
-class AppointmentByMatchResult extends $pb.GeneratedMessage {
-  factory AppointmentByMatchResult({
-    $core.Iterable<$1.MatchFieldResult>? matchResults,
-  }) {
-    final result = create();
-    if (matchResults != null) result.matchResults.addAll(matchResults);
-    return result;
-  }
-
-  AppointmentByMatchResult._();
-
-  factory AppointmentByMatchResult.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory AppointmentByMatchResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'AppointmentByMatchResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..pc<$1.MatchFieldResult>(2, _omitFieldNames ? '' : 'MatchResults', $pb.PbFieldType.PM, protoName: 'MatchResults', subBuilder: $1.MatchFieldResult.create)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  AppointmentByMatchResult clone() => AppointmentByMatchResult()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  AppointmentByMatchResult copyWith(void Function(AppointmentByMatchResult) updates) => super.copyWith((message) => updates(message as AppointmentByMatchResult)) as AppointmentByMatchResult;
-
-  @$core.override
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static AppointmentByMatchResult create() => AppointmentByMatchResult._();
-  @$core.override
-  AppointmentByMatchResult createEmptyInstance() => create();
-  static $pb.PbList<AppointmentByMatchResult> createRepeated() => $pb.PbList<AppointmentByMatchResult>();
-  @$core.pragma('dart2js:noInline')
-  static AppointmentByMatchResult getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<AppointmentByMatchResult>(create);
-  static AppointmentByMatchResult? _defaultInstance;
-
-  @$pb.TagNumber(2)
-  $pb.PbList<$1.MatchFieldResult> get matchResults => $_getList(0);
-}
-
-
-const $core.bool _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
-const $core.bool _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
--- a/lib/appointmentQuery.pbenum.dart
+++ b/lib/appointmentQuery.pbenum.dart
@@ -1,12 +0,0 @@
-// This is a generated file - do not edit.
-//
-// Generated from appointmentQuery.proto.
-
-// @dart = 3.3
-
-// ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
-
--- a/lib/appointmentQuery.pbgrpc.dart
+++ b/lib/appointmentQuery.pbgrpc.dart
@@ -1,195 +0,0 @@
-// This is a generated file - do not edit.
-//
-// Generated from appointmentQuery.proto.
-
-// @dart = 3.3
-
-// ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
-
-import 'dart:async' as $async;
-import 'dart:core' as $core;
-
-import 'package:grpc/service_api.dart' as $grpc;
-import 'package:protobuf/protobuf.dart' as $pb;
-
-import 'appointmentQuery.pb.dart' as $0;
-import 'clickhouse.pb.dart' as $2;
-import 'shared.pb.dart' as $1;
-
-export 'appointmentQuery.pb.dart';
-
-@$pb.GrpcServiceName('api.AppointmentQuery')
-class AppointmentQueryClient extends $grpc.Client {
-  /// The hostname for this service.
-  static const $core.String defaultHost = '';
-
-  /// OAuth scopes needed for the client.
-  static const $core.List<$core.String> oauthScopes = [
-    '',
-  ];
-
-  AppointmentQueryClient(super.channel, {super.options, super.interceptors});
-
-  $grpc.ResponseFuture<$0.AppointmentByIdResult> getByIds($0.AppointmentByIdQuery request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$getByIds, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.AppointmentByFilterResult> find($0.AppointmentByFilterQuery request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$find, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.AppointmentByMatchResult> findMatchingFieldValues($0.AppointmentByMatchQuery request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$findMatchingFieldValues, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$1.ElementByMatchResult> findMatchingFieldElements($1.ElementByMatchSiteQuery request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$findMatchingFieldElements, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$1.ExtractResult> extract($1.ExtractSiteQuery request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$extract, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$2.GetKPIDataResult> getKPIData($2.GetKPIDataSiteQuery request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$getKPIData, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$1.CountLinesResult> countLines($1.CountLinesQuery request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$countLines, request, options: options);
-  }
-
-    // method descriptors
-
-  static final _$getByIds = $grpc.ClientMethod<$0.AppointmentByIdQuery, $0.AppointmentByIdResult>(
-      '/api.AppointmentQuery/GetByIds',
-      ($0.AppointmentByIdQuery value) => value.writeToBuffer(),
-      $0.AppointmentByIdResult.fromBuffer);
-  static final _$find = $grpc.ClientMethod<$0.AppointmentByFilterQuery, $0.AppointmentByFilterResult>(
-      '/api.AppointmentQuery/Find',
-      ($0.AppointmentByFilterQuery value) => value.writeToBuffer(),
-      $0.AppointmentByFilterResult.fromBuffer);
-  static final _$findMatchingFieldValues = $grpc.ClientMethod<$0.AppointmentByMatchQuery, $0.AppointmentByMatchResult>(
-      '/api.AppointmentQuery/FindMatchingFieldValues',
-      ($0.AppointmentByMatchQuery value) => value.writeToBuffer(),
-      $0.AppointmentByMatchResult.fromBuffer);
-  static final _$findMatchingFieldElements = $grpc.ClientMethod<$1.ElementByMatchSiteQuery, $1.ElementByMatchResult>(
-      '/api.AppointmentQuery/FindMatchingFieldElements',
-      ($1.ElementByMatchSiteQuery value) => value.writeToBuffer(),
-      $1.ElementByMatchResult.fromBuffer);
-  static final _$extract = $grpc.ClientMethod<$1.ExtractSiteQuery, $1.ExtractResult>(
-      '/api.AppointmentQuery/Extract',
-      ($1.ExtractSiteQuery value) => value.writeToBuffer(),
-      $1.ExtractResult.fromBuffer);
-  static final _$getKPIData = $grpc.ClientMethod<$2.GetKPIDataSiteQuery, $2.GetKPIDataResult>(
-      '/api.AppointmentQuery/GetKPIData',
-      ($2.GetKPIDataSiteQuery value) => value.writeToBuffer(),
-      $2.GetKPIDataResult.fromBuffer);
-  static final _$countLines = $grpc.ClientMethod<$1.CountLinesQuery, $1.CountLinesResult>(
-      '/api.AppointmentQuery/CountLines',
-      ($1.CountLinesQuery value) => value.writeToBuffer(),
-      $1.CountLinesResult.fromBuffer);
-}
-
-@$pb.GrpcServiceName('api.AppointmentQuery')
-abstract class AppointmentQueryServiceBase extends $grpc.Service {
-  $core.String get $name => 'api.AppointmentQuery';
-
-  AppointmentQueryServiceBase() {
-    $addMethod($grpc.ServiceMethod<$0.AppointmentByIdQuery, $0.AppointmentByIdResult>(
-        'GetByIds',
-        getByIds_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $0.AppointmentByIdQuery.fromBuffer(value),
-        ($0.AppointmentByIdResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.AppointmentByFilterQuery, $0.AppointmentByFilterResult>(
-        'Find',
-        find_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $0.AppointmentByFilterQuery.fromBuffer(value),
-        ($0.AppointmentByFilterResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.AppointmentByMatchQuery, $0.AppointmentByMatchResult>(
-        'FindMatchingFieldValues',
-        findMatchingFieldValues_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $0.AppointmentByMatchQuery.fromBuffer(value),
-        ($0.AppointmentByMatchResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$1.ElementByMatchSiteQuery, $1.ElementByMatchResult>(
-        'FindMatchingFieldElements',
-        findMatchingFieldElements_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $1.ElementByMatchSiteQuery.fromBuffer(value),
-        ($1.ElementByMatchResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$1.ExtractSiteQuery, $1.ExtractResult>(
-        'Extract',
-        extract_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $1.ExtractSiteQuery.fromBuffer(value),
-        ($1.ExtractResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$2.GetKPIDataSiteQuery, $2.GetKPIDataResult>(
-        'GetKPIData',
-        getKPIData_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $2.GetKPIDataSiteQuery.fromBuffer(value),
-        ($2.GetKPIDataResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$1.CountLinesQuery, $1.CountLinesResult>(
-        'CountLines',
-        countLines_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $1.CountLinesQuery.fromBuffer(value),
-        ($1.CountLinesResult value) => value.writeToBuffer()));
-  }
-
-  $async.Future<$0.AppointmentByIdResult> getByIds_Pre($grpc.ServiceCall $call, $async.Future<$0.AppointmentByIdQuery> $request) async {
-    return getByIds($call, await $request);
-  }
-
-  $async.Future<$0.AppointmentByIdResult> getByIds($grpc.ServiceCall call, $0.AppointmentByIdQuery request);
-
-  $async.Future<$0.AppointmentByFilterResult> find_Pre($grpc.ServiceCall $call, $async.Future<$0.AppointmentByFilterQuery> $request) async {
-    return find($call, await $request);
-  }
-
-  $async.Future<$0.AppointmentByFilterResult> find($grpc.ServiceCall call, $0.AppointmentByFilterQuery request);
-
-  $async.Future<$0.AppointmentByMatchResult> findMatchingFieldValues_Pre($grpc.ServiceCall $call, $async.Future<$0.AppointmentByMatchQuery> $request) async {
-    return findMatchingFieldValues($call, await $request);
-  }
-
-  $async.Future<$0.AppointmentByMatchResult> findMatchingFieldValues($grpc.ServiceCall call, $0.AppointmentByMatchQuery request);
-
-  $async.Future<$1.ElementByMatchResult> findMatchingFieldElements_Pre($grpc.ServiceCall $call, $async.Future<$1.ElementByMatchSiteQuery> $request) async {
-    return findMatchingFieldElements($call, await $request);
-  }
-
-  $async.Future<$1.ElementByMatchResult> findMatchingFieldElements($grpc.ServiceCall call, $1.ElementByMatchSiteQuery request);
-
-  $async.Future<$1.ExtractResult> extract_Pre($grpc.ServiceCall $call, $async.Future<$1.ExtractSiteQuery> $request) async {
-    return extract($call, await $request);
-  }
-
-  $async.Future<$1.ExtractResult> extract($grpc.ServiceCall call, $1.ExtractSiteQuery request);
-
-  $async.Future<$2.GetKPIDataResult> getKPIData_Pre($grpc.ServiceCall $call, $async.Future<$2.GetKPIDataSiteQuery> $request) async {
-    return getKPIData($call, await $request);
-  }
-
-  $async.Future<$2.GetKPIDataResult> getKPIData($grpc.ServiceCall call, $2.GetKPIDataSiteQuery request);
-
-  $async.Future<$1.CountLinesResult> countLines_Pre($grpc.ServiceCall $call, $async.Future<$1.CountLinesQuery> $request) async {
-    return countLines($call, await $request);
-  }
-
-  $async.Future<$1.CountLinesResult> countLines($grpc.ServiceCall call, $1.CountLinesQuery request);
-
-}
--- a/lib/appointmentQuery.pbjson.dart
+++ b/lib/appointmentQuery.pbjson.dart
@@ -1,129 +0,0 @@
-// This is a generated file - do not edit.
-//
-// Generated from appointmentQuery.proto.
-
-// @dart = 3.3
-
-// ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
-
-import 'dart:convert' as $convert;
-import 'dart:core' as $core;
-import 'dart:typed_data' as $typed_data;
-
-@$core.Deprecated('Use appointmentByIdQueryDescriptor instead')
-const AppointmentByIdQuery$json = {
-  '1': 'AppointmentByIdQuery',
-  '2': [
-    {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.QuerySiteHeader', '8': {}, '10': 'Header'},
-    {'1': 'IDs', '3': 2, '4': 3, '5': 11, '6': '.api.EntityID', '8': {}, '10': 'IDs'},
-    {'1': 'Options', '3': 3, '4': 1, '5': 11, '6': '.api.AppointmentQueryOptions', '10': 'Options'},
-  ],
-  '7': {},
-};
-
-/// Descriptor for `AppointmentByIdQuery`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List appointmentByIdQueryDescriptor = $convert.base64Decode(
-    'ChRBcHBvaW50bWVudEJ5SWRRdWVyeRI2CgZIZWFkZXIYASABKAsyFC5hcGkuUXVlcnlTaXRlSG'
-    'VhZGVyQgj6QgWKAQIQAVIGSGVhZGVyEikKA0lEcxgCIAMoCzINLmFwaS5FbnRpdHlJREII+kIF'
-    'kgECCAFSA0lEcxI2CgdPcHRpb25zGAMgASgLMhwuYXBpLkFwcG9pbnRtZW50UXVlcnlPcHRpb2'
-    '5zUgdPcHRpb25zOh2SQREKD9IBBkhlYWRlctIBA0lEc6K7GAVRdWVyeQ==');
-
-@$core.Deprecated('Use appointmentByIdResultDescriptor instead')
-const AppointmentByIdResult$json = {
-  '1': 'AppointmentByIdResult',
-  '2': [
-    {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.ResultHeader', '10': 'Header'},
-    {'1': 'Objects', '3': 2, '4': 3, '5': 11, '6': '.api.Appointment', '10': 'Objects'},
-  ],
-  '7': {},
-};
-
-/// Descriptor for `AppointmentByIdResult`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List appointmentByIdResultDescriptor = $convert.base64Decode(
-    'ChVBcHBvaW50bWVudEJ5SWRSZXN1bHQSKQoGSGVhZGVyGAEgASgLMhEuYXBpLlJlc3VsdEhlYW'
-    'RlclIGSGVhZGVyEioKB09iamVjdHMYAiADKAsyEC5hcGkuQXBwb2ludG1lbnRSB09iamVjdHM6'
-    'D5JBAgoAorsYBlJlc3VsdA==');
-
-@$core.Deprecated('Use appointmentByFilterQueryDescriptor instead')
-const AppointmentByFilterQuery$json = {
-  '1': 'AppointmentByFilterQuery',
-  '2': [
-    {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.QuerySiteHeader', '8': {}, '10': 'Header'},
-    {'1': 'limitFilter', '3': 4, '4': 1, '5': 9, '8': {}, '10': 'limitFilter'},
-    {'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'},
-  ],
-  '7': {},
-};
-
-/// Descriptor for `AppointmentByFilterQuery`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List appointmentByFilterQueryDescriptor = $convert.base64Decode(
-    'ChhBcHBvaW50bWVudEJ5RmlsdGVyUXVlcnkSOQoGSGVhZGVyGAEgASgLMhQuYXBpLlF1ZXJ5U2'
-    'l0ZUhlYWRlckILkkEA+kIFigECEAFSBkhlYWRlchJGCgtsaW1pdEZpbHRlchgEIAEoCUIkkkEh'
-    'MhhOdW1iZXIgb2YgbWF4aW11bSByZXN1bHRKBSI1MDAiUgtsaW1pdEZpbHRlchIiCgxxdWVyeU'
-    'NvbnRleHQYBSABKAlSDHF1ZXJ5Q29udGV4dBI0CgxCbG9ja0ZpbHRlcnMYBiADKAsyEC5hcGku'
-    'QmxvY2tGaWx0ZXJSDEJsb2NrRmlsdGVycxI2CgdPcHRpb25zGAcgASgLMhwuYXBpLkFwcG9pbn'
-    'RtZW50UXVlcnlPcHRpb25zUgdPcHRpb25zOg6SQQsKCdIBBkhlYWRlcg==');
-
-@$core.Deprecated('Use appointmentByFilterResultDescriptor instead')
-const AppointmentByFilterResult$json = {
-  '1': 'AppointmentByFilterResult',
-  '2': [
-    {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.ResultHeader', '10': 'Header'},
-    {'1': 'Objects', '3': 2, '4': 3, '5': 11, '6': '.api.Appointment', '10': 'Objects'},
-    {'1': 'queryContext', '3': 3, '4': 1, '5': 9, '10': 'queryContext'},
-  ],
-};
-
-/// Descriptor for `AppointmentByFilterResult`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List appointmentByFilterResultDescriptor = $convert.base64Decode(
-    'ChlBcHBvaW50bWVudEJ5RmlsdGVyUmVzdWx0EikKBkhlYWRlchgBIAEoCzIRLmFwaS5SZXN1bH'
-    'RIZWFkZXJSBkhlYWRlchIqCgdPYmplY3RzGAIgAygLMhAuYXBpLkFwcG9pbnRtZW50UgdPYmpl'
-    'Y3RzEiIKDHF1ZXJ5Q29udGV4dBgDIAEoCVIMcXVlcnlDb250ZXh0');
-
-@$core.Deprecated('Use appointmentQueryOptionsDescriptor instead')
-const AppointmentQueryOptions$json = {
-  '1': 'AppointmentQueryOptions',
-};
-
-/// Descriptor for `AppointmentQueryOptions`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List appointmentQueryOptionsDescriptor = $convert.base64Decode(
-    'ChdBcHBvaW50bWVudFF1ZXJ5T3B0aW9ucw==');
-
-@$core.Deprecated('Use appointmentByMatchQueryDescriptor instead')
-const AppointmentByMatchQuery$json = {
-  '1': 'AppointmentByMatchQuery',
-  '2': [
-    {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.QuerySiteHeader', '8': {}, '10': 'Header'},
-    {'1': 'BlockFilters', '3': 5, '4': 3, '5': 11, '6': '.api.BlockFilter', '10': 'BlockFilters'},
-    {'1': 'MatchFields', '3': 6, '4': 3, '5': 11, '6': '.api.MatchField', '8': {}, '10': 'MatchFields'},
-  ],
-  '7': {},
-};
-
-/// Descriptor for `AppointmentByMatchQuery`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List appointmentByMatchQueryDescriptor = $convert.base64Decode(
-    'ChdBcHBvaW50bWVudEJ5TWF0Y2hRdWVyeRI2CgZIZWFkZXIYASABKAsyFC5hcGkuUXVlcnlTaX'
-    'RlSGVhZGVyQgj6QgWKAQIQAVIGSGVhZGVyEjQKDEJsb2NrRmlsdGVycxgFIAMoCzIQLmFwaS5C'
-    'bG9ja0ZpbHRlclIMQmxvY2tGaWx0ZXJzEmkKC01hdGNoRmllbGRzGAYgAygLMg8uYXBpLk1hdG'
-    'NoRmllbGRCNpJBMzIxTWF0Y2hGaWVsZCBsaXN0IHN0cnVjdHVyZSwgZm9yIEZpbmRNYXRjaGlu'
-    'ZyBxdWVyeVILTWF0Y2hGaWVsZHM6DpJBCwoJ0gEGSGVhZGVy');
-
-@$core.Deprecated('Use appointmentByMatchResultDescriptor instead')
-const AppointmentByMatchResult$json = {
-  '1': 'AppointmentByMatchResult',
-  '2': [
-    {'1': 'MatchResults', '3': 2, '4': 3, '5': 11, '6': '.api.MatchFieldResult', '10': 'MatchResults'},
-  ],
-};
-
-/// Descriptor for `AppointmentByMatchResult`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List appointmentByMatchResultDescriptor = $convert.base64Decode(
-    'ChhBcHBvaW50bWVudEJ5TWF0Y2hSZXN1bHQSOQoMTWF0Y2hSZXN1bHRzGAIgAygLMhUuYXBpLk'
-    '1hdGNoRmllbGRSZXN1bHRSDE1hdGNoUmVzdWx0cw==');
-
--- a/lib/attachmentType.pb.dart
+++ b/lib/attachmentType.pb.dart
--- a/lib/attachmentType.pbenum.dart
+++ b/lib/attachmentType.pbenum.dart
@@ -1,12 +1,11 @@
-// This is a generated file - do not edit.
 //
-// Generated from attachmentType.proto.
-
+//  Generated code. Do not modify.
+//  source: attachmentType.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

--- a/lib/attachmentType.pbgrpc.dart
+++ b/lib/attachmentType.pbgrpc.dart
@@ -1,14 +1,13 @@
-// This is a generated file - do not edit.
 //
-// Generated from attachmentType.proto.
-
+//  Generated code. Do not modify.
+//  source: attachmentType.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:async' as $async;
 import 'dart:core' as $core;
@@ -16,120 +15,62 @@ import 'dart:core' as $core;
 import 'package:grpc/service_api.dart' as $grpc;
 import 'package:protobuf/protobuf.dart' as $pb;

-import 'attachmentType.pb.dart' as $0;
+import 'attachmentType.pb.dart' as $7;

 export 'attachmentType.pb.dart';

@$pb.GrpcServiceName('api.AttachmentTypeService')
 class AttachmentTypeServiceClient extends $grpc.Client {
-  /// The hostname for this service.
-  static const $core.String defaultHost = '';
-
-  /// OAuth scopes needed for the client.
-  static const $core.List<$core.String> oauthScopes = [
-    '',
-  ];
+  static final _$create = $grpc.ClientMethod<$7.CreateAttachmentTypeRequest, $7.CreateAttachmentTypeResponse>(
+      '/api.AttachmentTypeService/Create',
+      ($7.CreateAttachmentTypeRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $7.CreateAttachmentTypeResponse.fromBuffer(value));
+  static final _$get = $grpc.ClientMethod<$7.GetAttachmentTypeRequest, $7.GetAttachmentTypeResponse>(
+      '/api.AttachmentTypeService/Get',
+      ($7.GetAttachmentTypeRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $7.GetAttachmentTypeResponse.fromBuffer(value));
+  static final _$list = $grpc.ClientMethod<$7.ListAttachmentTypeRequest, $7.ListAttachmentTypeResponse>(
+      '/api.AttachmentTypeService/List',
+      ($7.ListAttachmentTypeRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $7.ListAttachmentTypeResponse.fromBuffer(value));
+  static final _$update = $grpc.ClientMethod<$7.UpdateAttachmentTypeRequest, $7.UpdateAttachmentTypeResponse>(
+      '/api.AttachmentTypeService/Update',
+      ($7.UpdateAttachmentTypeRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $7.UpdateAttachmentTypeResponse.fromBuffer(value));
+  static final _$delete = $grpc.ClientMethod<$7.DeleteAttachmentTypeRequest, $7.DeleteAttachmentTypeResponse>(
+      '/api.AttachmentTypeService/Delete',
+      ($7.DeleteAttachmentTypeRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $7.DeleteAttachmentTypeResponse.fromBuffer(value));
+  static final _$deleteAll = $grpc.ClientMethod<$7.DeleteAllAttachmentsTypeRequest, $7.DeleteAllAttachmentsTypeResponse>(
+      '/api.AttachmentTypeService/DeleteAll',
+      ($7.DeleteAllAttachmentsTypeRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $7.DeleteAllAttachmentsTypeResponse.fromBuffer(value));

  AttachmentTypeServiceClient(super.channel, {super.options, super.interceptors});

-  $grpc.ResponseFuture<$0.CreateAttachmentTypeResponse> create($0.CreateAttachmentTypeRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$7.CreateAttachmentTypeResponse> create($7.CreateAttachmentTypeRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$create, request, options: options);
  }

-  $grpc.ResponseFuture<$0.GetAttachmentTypeResponse> get($0.GetAttachmentTypeRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$7.GetAttachmentTypeResponse> get($7.GetAttachmentTypeRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$get, request, options: options);
  }

-  $grpc.ResponseFuture<$0.ListAttachmentTypeResponse> list($0.ListAttachmentTypeRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$7.ListAttachmentTypeResponse> list($7.ListAttachmentTypeRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$list, request, options: options);
  }

-  $grpc.ResponseFuture<$0.UpdateAttachmentTypeResponse> update($0.UpdateAttachmentTypeRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$7.UpdateAttachmentTypeResponse> update($7.UpdateAttachmentTypeRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$update, request, options: options);
  }

-  $grpc.ResponseFuture<$0.DeleteAttachmentTypeResponse> delete($0.DeleteAttachmentTypeRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$7.DeleteAttachmentTypeResponse> delete($7.DeleteAttachmentTypeRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$delete, request, options: options);
  }

-  $grpc.ResponseFuture<$0.DeleteAllAttachmentsTypeResponse> deleteAll($0.DeleteAllAttachmentsTypeRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$7.DeleteAllAttachmentsTypeResponse> deleteAll($7.DeleteAllAttachmentsTypeRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$deleteAll, request, options: options);
  }
-
-  $grpc.ResponseFuture<$0.CreateAttachmentTypeResponse> createOnSite($0.CreateAttachmentTypeOnSiteRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$createOnSite, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.GetAttachmentTypeResponse> getOnSite($0.GetAttachmentTypeOnSiteRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$getOnSite, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.ListAttachmentTypeResponse> listOnSite($0.ListAttachmentTypeOnSiteRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$listOnSite, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.UpdateAttachmentTypeResponse> updateOnSite($0.UpdateAttachmentTypeOnSiteRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$updateOnSite, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.DeleteAttachmentTypeResponse> deleteOnSite($0.DeleteAttachmentTypeOnSiteRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$deleteOnSite, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.DeleteAllAttachmentsTypeResponse> deleteAllOnSite($0.DeleteAllAttachmentsTypeOnSiteRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$deleteAllOnSite, request, options: options);
-  }
-
-    // method descriptors
-
-  static final _$create = $grpc.ClientMethod<$0.CreateAttachmentTypeRequest, $0.CreateAttachmentTypeResponse>(
-      '/api.AttachmentTypeService/Create',
-      ($0.CreateAttachmentTypeRequest value) => value.writeToBuffer(),
-      $0.CreateAttachmentTypeResponse.fromBuffer);
-  static final _$get = $grpc.ClientMethod<$0.GetAttachmentTypeRequest, $0.GetAttachmentTypeResponse>(
-      '/api.AttachmentTypeService/Get',
-      ($0.GetAttachmentTypeRequest value) => value.writeToBuffer(),
-      $0.GetAttachmentTypeResponse.fromBuffer);
-  static final _$list = $grpc.ClientMethod<$0.ListAttachmentTypeRequest, $0.ListAttachmentTypeResponse>(
-      '/api.AttachmentTypeService/List',
-      ($0.ListAttachmentTypeRequest value) => value.writeToBuffer(),
-      $0.ListAttachmentTypeResponse.fromBuffer);
-  static final _$update = $grpc.ClientMethod<$0.UpdateAttachmentTypeRequest, $0.UpdateAttachmentTypeResponse>(
-      '/api.AttachmentTypeService/Update',
-      ($0.UpdateAttachmentTypeRequest value) => value.writeToBuffer(),
-      $0.UpdateAttachmentTypeResponse.fromBuffer);
-  static final _$delete = $grpc.ClientMethod<$0.DeleteAttachmentTypeRequest, $0.DeleteAttachmentTypeResponse>(
-      '/api.AttachmentTypeService/Delete',
-      ($0.DeleteAttachmentTypeRequest value) => value.writeToBuffer(),
-      $0.DeleteAttachmentTypeResponse.fromBuffer);
-  static final _$deleteAll = $grpc.ClientMethod<$0.DeleteAllAttachmentsTypeRequest, $0.DeleteAllAttachmentsTypeResponse>(
-      '/api.AttachmentTypeService/DeleteAll',
-      ($0.DeleteAllAttachmentsTypeRequest value) => value.writeToBuffer(),
-      $0.DeleteAllAttachmentsTypeResponse.fromBuffer);
-  static final _$createOnSite = $grpc.ClientMethod<$0.CreateAttachmentTypeOnSiteRequest, $0.CreateAttachmentTypeResponse>(
-      '/api.AttachmentTypeService/CreateOnSite',
-      ($0.CreateAttachmentTypeOnSiteRequest value) => value.writeToBuffer(),
-      $0.CreateAttachmentTypeResponse.fromBuffer);
-  static final _$getOnSite = $grpc.ClientMethod<$0.GetAttachmentTypeOnSiteRequest, $0.GetAttachmentTypeResponse>(
-      '/api.AttachmentTypeService/GetOnSite',
-      ($0.GetAttachmentTypeOnSiteRequest value) => value.writeToBuffer(),
-      $0.GetAttachmentTypeResponse.fromBuffer);
-  static final _$listOnSite = $grpc.ClientMethod<$0.ListAttachmentTypeOnSiteRequest, $0.ListAttachmentTypeResponse>(
-      '/api.AttachmentTypeService/ListOnSite',
-      ($0.ListAttachmentTypeOnSiteRequest value) => value.writeToBuffer(),
-      $0.ListAttachmentTypeResponse.fromBuffer);
-  static final _$updateOnSite = $grpc.ClientMethod<$0.UpdateAttachmentTypeOnSiteRequest, $0.UpdateAttachmentTypeResponse>(
-      '/api.AttachmentTypeService/UpdateOnSite',
-      ($0.UpdateAttachmentTypeOnSiteRequest value) => value.writeToBuffer(),
-      $0.UpdateAttachmentTypeResponse.fromBuffer);
-  static final _$deleteOnSite = $grpc.ClientMethod<$0.DeleteAttachmentTypeOnSiteRequest, $0.DeleteAttachmentTypeResponse>(
-      '/api.AttachmentTypeService/DeleteOnSite',
-      ($0.DeleteAttachmentTypeOnSiteRequest value) => value.writeToBuffer(),
-      $0.DeleteAttachmentTypeResponse.fromBuffer);
-  static final _$deleteAllOnSite = $grpc.ClientMethod<$0.DeleteAllAttachmentsTypeOnSiteRequest, $0.DeleteAllAttachmentsTypeResponse>(
-      '/api.AttachmentTypeService/DeleteAllOnSite',
-      ($0.DeleteAllAttachmentsTypeOnSiteRequest value) => value.writeToBuffer(),
-      $0.DeleteAllAttachmentsTypeResponse.fromBuffer);
 }

@$pb.GrpcServiceName('api.AttachmentTypeService')
@@ -137,162 +78,78 @@ abstract class AttachmentTypeServiceBase extends $grpc.Service {
  $core.String get $name => 'api.AttachmentTypeService';

  AttachmentTypeServiceBase() {
-    $addMethod($grpc.ServiceMethod<$0.CreateAttachmentTypeRequest, $0.CreateAttachmentTypeResponse>(
+    $addMethod($grpc.ServiceMethod<$7.CreateAttachmentTypeRequest, $7.CreateAttachmentTypeResponse>(
        'Create',
        create_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.CreateAttachmentTypeRequest.fromBuffer(value),
-        ($0.CreateAttachmentTypeResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.GetAttachmentTypeRequest, $0.GetAttachmentTypeResponse>(
+        ($core.List<$core.int> value) => $7.CreateAttachmentTypeRequest.fromBuffer(value),
+        ($7.CreateAttachmentTypeResponse value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$7.GetAttachmentTypeRequest, $7.GetAttachmentTypeResponse>(
        'Get',
        get_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.GetAttachmentTypeRequest.fromBuffer(value),
-        ($0.GetAttachmentTypeResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.ListAttachmentTypeRequest, $0.ListAttachmentTypeResponse>(
+        ($core.List<$core.int> value) => $7.GetAttachmentTypeRequest.fromBuffer(value),
+        ($7.GetAttachmentTypeResponse value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$7.ListAttachmentTypeRequest, $7.ListAttachmentTypeResponse>(
        'List',
        list_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.ListAttachmentTypeRequest.fromBuffer(value),
-        ($0.ListAttachmentTypeResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.UpdateAttachmentTypeRequest, $0.UpdateAttachmentTypeResponse>(
+        ($core.List<$core.int> value) => $7.ListAttachmentTypeRequest.fromBuffer(value),
+        ($7.ListAttachmentTypeResponse value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$7.UpdateAttachmentTypeRequest, $7.UpdateAttachmentTypeResponse>(
        'Update',
        update_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.UpdateAttachmentTypeRequest.fromBuffer(value),
-        ($0.UpdateAttachmentTypeResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.DeleteAttachmentTypeRequest, $0.DeleteAttachmentTypeResponse>(
+        ($core.List<$core.int> value) => $7.UpdateAttachmentTypeRequest.fromBuffer(value),
+        ($7.UpdateAttachmentTypeResponse value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$7.DeleteAttachmentTypeRequest, $7.DeleteAttachmentTypeResponse>(
        'Delete',
        delete_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.DeleteAttachmentTypeRequest.fromBuffer(value),
-        ($0.DeleteAttachmentTypeResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.DeleteAllAttachmentsTypeRequest, $0.DeleteAllAttachmentsTypeResponse>(
+        ($core.List<$core.int> value) => $7.DeleteAttachmentTypeRequest.fromBuffer(value),
+        ($7.DeleteAttachmentTypeResponse value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$7.DeleteAllAttachmentsTypeRequest, $7.DeleteAllAttachmentsTypeResponse>(
        'DeleteAll',
        deleteAll_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.DeleteAllAttachmentsTypeRequest.fromBuffer(value),
-        ($0.DeleteAllAttachmentsTypeResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.CreateAttachmentTypeOnSiteRequest, $0.CreateAttachmentTypeResponse>(
-        'CreateOnSite',
-        createOnSite_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $0.CreateAttachmentTypeOnSiteRequest.fromBuffer(value),
-        ($0.CreateAttachmentTypeResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.GetAttachmentTypeOnSiteRequest, $0.GetAttachmentTypeResponse>(
-        'GetOnSite',
-        getOnSite_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $0.GetAttachmentTypeOnSiteRequest.fromBuffer(value),
-        ($0.GetAttachmentTypeResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.ListAttachmentTypeOnSiteRequest, $0.ListAttachmentTypeResponse>(
-        'ListOnSite',
-        listOnSite_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $0.ListAttachmentTypeOnSiteRequest.fromBuffer(value),
-        ($0.ListAttachmentTypeResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.UpdateAttachmentTypeOnSiteRequest, $0.UpdateAttachmentTypeResponse>(
-        'UpdateOnSite',
-        updateOnSite_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $0.UpdateAttachmentTypeOnSiteRequest.fromBuffer(value),
-        ($0.UpdateAttachmentTypeResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.DeleteAttachmentTypeOnSiteRequest, $0.DeleteAttachmentTypeResponse>(
-        'DeleteOnSite',
-        deleteOnSite_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $0.DeleteAttachmentTypeOnSiteRequest.fromBuffer(value),
-        ($0.DeleteAttachmentTypeResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.DeleteAllAttachmentsTypeOnSiteRequest, $0.DeleteAllAttachmentsTypeResponse>(
-        'DeleteAllOnSite',
-        deleteAllOnSite_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $0.DeleteAllAttachmentsTypeOnSiteRequest.fromBuffer(value),
-        ($0.DeleteAllAttachmentsTypeResponse value) => value.writeToBuffer()));
+        ($core.List<$core.int> value) => $7.DeleteAllAttachmentsTypeRequest.fromBuffer(value),
+        ($7.DeleteAllAttachmentsTypeResponse value) => value.writeToBuffer()));
  }

-  $async.Future<$0.CreateAttachmentTypeResponse> create_Pre($grpc.ServiceCall $call, $async.Future<$0.CreateAttachmentTypeRequest> $request) async {
+  $async.Future<$7.CreateAttachmentTypeResponse> create_Pre($grpc.ServiceCall $call, $async.Future<$7.CreateAttachmentTypeRequest> $request) async {
    return create($call, await $request);
  }

-  $async.Future<$0.CreateAttachmentTypeResponse> create($grpc.ServiceCall call, $0.CreateAttachmentTypeRequest request);
-
-  $async.Future<$0.GetAttachmentTypeResponse> get_Pre($grpc.ServiceCall $call, $async.Future<$0.GetAttachmentTypeRequest> $request) async {
+  $async.Future<$7.GetAttachmentTypeResponse> get_Pre($grpc.ServiceCall $call, $async.Future<$7.GetAttachmentTypeRequest> $request) async {
    return get($call, await $request);
  }

-  $async.Future<$0.GetAttachmentTypeResponse> get($grpc.ServiceCall call, $0.GetAttachmentTypeRequest request);
-
-  $async.Future<$0.ListAttachmentTypeResponse> list_Pre($grpc.ServiceCall $call, $async.Future<$0.ListAttachmentTypeRequest> $request) async {
+  $async.Future<$7.ListAttachmentTypeResponse> list_Pre($grpc.ServiceCall $call, $async.Future<$7.ListAttachmentTypeRequest> $request) async {
    return list($call, await $request);
  }

-  $async.Future<$0.ListAttachmentTypeResponse> list($grpc.ServiceCall call, $0.ListAttachmentTypeRequest request);
-
-  $async.Future<$0.UpdateAttachmentTypeResponse> update_Pre($grpc.ServiceCall $call, $async.Future<$0.UpdateAttachmentTypeRequest> $request) async {
+  $async.Future<$7.UpdateAttachmentTypeResponse> update_Pre($grpc.ServiceCall $call, $async.Future<$7.UpdateAttachmentTypeRequest> $request) async {
    return update($call, await $request);
  }

-  $async.Future<$0.UpdateAttachmentTypeResponse> update($grpc.ServiceCall call, $0.UpdateAttachmentTypeRequest request);
-
-  $async.Future<$0.DeleteAttachmentTypeResponse> delete_Pre($grpc.ServiceCall $call, $async.Future<$0.DeleteAttachmentTypeRequest> $request) async {
+  $async.Future<$7.DeleteAttachmentTypeResponse> delete_Pre($grpc.ServiceCall $call, $async.Future<$7.DeleteAttachmentTypeRequest> $request) async {
    return delete($call, await $request);
  }

-  $async.Future<$0.DeleteAttachmentTypeResponse> delete($grpc.ServiceCall call, $0.DeleteAttachmentTypeRequest request);
-
-  $async.Future<$0.DeleteAllAttachmentsTypeResponse> deleteAll_Pre($grpc.ServiceCall $call, $async.Future<$0.DeleteAllAttachmentsTypeRequest> $request) async {
+  $async.Future<$7.DeleteAllAttachmentsTypeResponse> deleteAll_Pre($grpc.ServiceCall $call, $async.Future<$7.DeleteAllAttachmentsTypeRequest> $request) async {
    return deleteAll($call, await $request);
  }

-  $async.Future<$0.DeleteAllAttachmentsTypeResponse> deleteAll($grpc.ServiceCall call, $0.DeleteAllAttachmentsTypeRequest request);
-
-  $async.Future<$0.CreateAttachmentTypeResponse> createOnSite_Pre($grpc.ServiceCall $call, $async.Future<$0.CreateAttachmentTypeOnSiteRequest> $request) async {
-    return createOnSite($call, await $request);
-  }
-
-  $async.Future<$0.CreateAttachmentTypeResponse> createOnSite($grpc.ServiceCall call, $0.CreateAttachmentTypeOnSiteRequest request);
-
-  $async.Future<$0.GetAttachmentTypeResponse> getOnSite_Pre($grpc.ServiceCall $call, $async.Future<$0.GetAttachmentTypeOnSiteRequest> $request) async {
-    return getOnSite($call, await $request);
-  }
-
-  $async.Future<$0.GetAttachmentTypeResponse> getOnSite($grpc.ServiceCall call, $0.GetAttachmentTypeOnSiteRequest request);
-
-  $async.Future<$0.ListAttachmentTypeResponse> listOnSite_Pre($grpc.ServiceCall $call, $async.Future<$0.ListAttachmentTypeOnSiteRequest> $request) async {
-    return listOnSite($call, await $request);
-  }
-
-  $async.Future<$0.ListAttachmentTypeResponse> listOnSite($grpc.ServiceCall call, $0.ListAttachmentTypeOnSiteRequest request);
-
-  $async.Future<$0.UpdateAttachmentTypeResponse> updateOnSite_Pre($grpc.ServiceCall $call, $async.Future<$0.UpdateAttachmentTypeOnSiteRequest> $request) async {
-    return updateOnSite($call, await $request);
-  }
-
-  $async.Future<$0.UpdateAttachmentTypeResponse> updateOnSite($grpc.ServiceCall call, $0.UpdateAttachmentTypeOnSiteRequest request);
-
-  $async.Future<$0.DeleteAttachmentTypeResponse> deleteOnSite_Pre($grpc.ServiceCall $call, $async.Future<$0.DeleteAttachmentTypeOnSiteRequest> $request) async {
-    return deleteOnSite($call, await $request);
-  }
-
-  $async.Future<$0.DeleteAttachmentTypeResponse> deleteOnSite($grpc.ServiceCall call, $0.DeleteAttachmentTypeOnSiteRequest request);
-
-  $async.Future<$0.DeleteAllAttachmentsTypeResponse> deleteAllOnSite_Pre($grpc.ServiceCall $call, $async.Future<$0.DeleteAllAttachmentsTypeOnSiteRequest> $request) async {
-    return deleteAllOnSite($call, await $request);
-  }
-
-  $async.Future<$0.DeleteAllAttachmentsTypeResponse> deleteAllOnSite($grpc.ServiceCall call, $0.DeleteAllAttachmentsTypeOnSiteRequest request);
-
+  $async.Future<$7.CreateAttachmentTypeResponse> create($grpc.ServiceCall call, $7.CreateAttachmentTypeRequest request);
+  $async.Future<$7.GetAttachmentTypeResponse> get($grpc.ServiceCall call, $7.GetAttachmentTypeRequest request);
+  $async.Future<$7.ListAttachmentTypeResponse> list($grpc.ServiceCall call, $7.ListAttachmentTypeRequest request);
+  $async.Future<$7.UpdateAttachmentTypeResponse> update($grpc.ServiceCall call, $7.UpdateAttachmentTypeRequest request);
+  $async.Future<$7.DeleteAttachmentTypeResponse> delete($grpc.ServiceCall call, $7.DeleteAttachmentTypeRequest request);
+  $async.Future<$7.DeleteAllAttachmentsTypeResponse> deleteAll($grpc.ServiceCall call, $7.DeleteAllAttachmentsTypeRequest request);
 }
--- a/lib/attachmentType.pbjson.dart
+++ b/lib/attachmentType.pbjson.dart
@@ -1,14 +1,13 @@
-// This is a generated file - do not edit.
 //
-// Generated from attachmentType.proto.
-
+//  Generated code. Do not modify.
+//  source: attachmentType.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
@@ -40,32 +39,6 @@ final $typed_data.Uint8List createAttachmentTypeRequestDescriptor = $convert.bas
    'b2xlcxIgCgtWaWV3ZXJSb2xlcxgHIAMoCVILVmlld2VyUm9sZXM6NJJBMQov0gEGSGVhZGVy0g'
    'EEQ29kZdIBBkVudGl0edIBBUxhYmVs0gELU2hhcmVQb2xpY3k=');

-@$core.Deprecated('Use createAttachmentTypeOnSiteRequestDescriptor instead')
-const CreateAttachmentTypeOnSiteRequest$json = {
-  '1': 'CreateAttachmentTypeOnSiteRequest',
-  '2': [
-    {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.RequestSiteHeader', '8': {}, '10': 'Header'},
-    {'1': 'Code', '3': 2, '4': 1, '5': 9, '8': {}, '10': 'Code'},
-    {'1': 'Entity', '3': 3, '4': 1, '5': 14, '6': '.api.EntityType', '8': {}, '10': 'Entity'},
-    {'1': 'Label', '3': 4, '4': 1, '5': 9, '8': {}, '10': 'Label'},
-    {'1': 'SharePolicy', '3': 5, '4': 1, '5': 14, '6': '.api.SharePolicy', '8': {}, '10': 'SharePolicy'},
-    {'1': 'ManagerRoles', '3': 6, '4': 3, '5': 9, '10': 'ManagerRoles'},
-    {'1': 'ViewerRoles', '3': 7, '4': 3, '5': 9, '10': 'ViewerRoles'},
-  ],
-  '7': {},
-};
-
-/// Descriptor for `CreateAttachmentTypeOnSiteRequest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List createAttachmentTypeOnSiteRequestDescriptor = $convert.base64Decode(
-    'CiFDcmVhdGVBdHRhY2htZW50VHlwZU9uU2l0ZVJlcXVlc3QSOAoGSGVhZGVyGAEgASgLMhYuYX'
-    'BpLlJlcXVlc3RTaXRlSGVhZGVyQgj6QgWKAQIQAVIGSGVhZGVyEkEKBENvZGUYAiABKAlCLZJB'
-    'EooBD15bYS16QS1aMC05LV0rJPpCFXITEAEyD15bYS16QS1aMC05LV0rJFIEQ29kZRIxCgZFbn'
-    'RpdHkYAyABKA4yDy5hcGkuRW50aXR5VHlwZUII+kIFggECEAFSBkVudGl0eRIdCgVMYWJlbBgE'
-    'IAEoCUIH+kIEcgIQAVIFTGFiZWwSPAoLU2hhcmVQb2xpY3kYBSABKA4yEC5hcGkuU2hhcmVQb2'
-    'xpY3lCCPpCBYIBAhABUgtTaGFyZVBvbGljeRIiCgxNYW5hZ2VyUm9sZXMYBiADKAlSDE1hbmFn'
-    'ZXJSb2xlcxIgCgtWaWV3ZXJSb2xlcxgHIAMoCVILVmlld2VyUm9sZXM6NJJBMQov0gEGSGVhZG'
-    'Vy0gEEQ29kZdIBBkVudGl0edIBBUxhYmVs0gELU2hhcmVQb2xpY3k=');
-
@$core.Deprecated('Use createAttachmentTypeResponseDescriptor instead')
 const CreateAttachmentTypeResponse$json = {
  '1': 'CreateAttachmentTypeResponse',
@@ -115,42 +88,6 @@ final $typed_data.Uint8List getAttachmentTypeRequestDescriptor = $convert.base64
    'igEOXlthLXpBLVowLTktXSr6QhJyEDIOXlthLXpBLVowLTktXSpSAklEOh6SQRsKGdIBBkhlYW'
    'RlctIBBENvZGXSAQZFbnRpdHk=');

-@$core.Deprecated('Use getAttachmentTypeOnSiteRequestDescriptor instead')
-const GetAttachmentTypeOnSiteRequest$json = {
-  '1': 'GetAttachmentTypeOnSiteRequest',
-  '2': [
-    {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.RequestSiteHeader', '8': {}, '10': 'Header'},
-    {
-      '1': 'Code',
-      '3': 2,
-      '4': 1,
-      '5': 9,
-      '8': {'3': true},
-      '10': 'Code',
-    },
-    {
-      '1': 'Entity',
-      '3': 3,
-      '4': 1,
-      '5': 14,
-      '6': '.api.EntityType',
-      '8': {'3': true},
-      '10': 'Entity',
-    },
-    {'1': 'ID', '3': 4, '4': 1, '5': 9, '8': {}, '10': 'ID'},
-  ],
-  '7': {},
-};
-
-/// Descriptor for `GetAttachmentTypeOnSiteRequest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List getAttachmentTypeOnSiteRequestDescriptor = $convert.base64Decode(
-    'Ch5HZXRBdHRhY2htZW50VHlwZU9uU2l0ZVJlcXVlc3QSOAoGSGVhZGVyGAEgASgLMhYuYXBpLl'
-    'JlcXVlc3RTaXRlSGVhZGVyQgj6QgWKAQIQAVIGSGVhZGVyEj8KBENvZGUYAiABKAlCKxgBkkER'
-    'igEOXlthLXpBLVowLTktXSr6QhJyEDIOXlthLXpBLVowLTktXSpSBENvZGUSMwoGRW50aXR5GA'
-    'MgASgOMg8uYXBpLkVudGl0eVR5cGVCChgB+kIFggECEAFSBkVudGl0eRI5CgJJRBgEIAEoCUIp'
-    'kkERigEOXlthLXpBLVowLTktXSr6QhJyEDIOXlthLXpBLVowLTktXSpSAklEOh6SQRsKGdIBBk'
-    'hlYWRlctIBBENvZGXSAQZFbnRpdHk=');
-
@$core.Deprecated('Use getAttachmentTypeResponseDescriptor instead')
 const GetAttachmentTypeResponse$json = {
  '1': 'GetAttachmentTypeResponse',
@@ -180,22 +117,6 @@ final $typed_data.Uint8List listAttachmentTypeRequestDescriptor = $convert.base6
    'N0UHJvamVjdEhlYWRlckII+kIFigECEAFSBkhlYWRlchIxCgZFbnRpdHkYAiABKA4yDy5hcGku'
    'RW50aXR5VHlwZUII+kIFggECEAFSBkVudGl0eToOkkELCgnSAQZIZWFkZXI=');

-@$core.Deprecated('Use listAttachmentTypeOnSiteRequestDescriptor instead')
-const ListAttachmentTypeOnSiteRequest$json = {
-  '1': 'ListAttachmentTypeOnSiteRequest',
-  '2': [
-    {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.RequestSiteHeader', '8': {}, '10': 'Header'},
-    {'1': 'Entity', '3': 2, '4': 1, '5': 14, '6': '.api.EntityType', '8': {}, '10': 'Entity'},
-  ],
-  '7': {},
-};
-
-/// Descriptor for `ListAttachmentTypeOnSiteRequest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List listAttachmentTypeOnSiteRequestDescriptor = $convert.base64Decode(
-    'Ch9MaXN0QXR0YWNobWVudFR5cGVPblNpdGVSZXF1ZXN0EjgKBkhlYWRlchgBIAEoCzIWLmFwaS'
-    '5SZXF1ZXN0U2l0ZUhlYWRlckII+kIFigECEAFSBkhlYWRlchIxCgZFbnRpdHkYAiABKA4yDy5h'
-    'cGkuRW50aXR5VHlwZUII+kIFggECEAFSBkVudGl0eToOkkELCgnSAQZIZWFkZXI=');
-
@$core.Deprecated('Use listAttachmentTypeResponseDescriptor instead')
 const ListAttachmentTypeResponse$json = {
  '1': 'ListAttachmentTypeResponse',
@@ -252,49 +173,6 @@ final $typed_data.Uint8List updateAttachmentTypeRequestDescriptor = $convert.bas
    'AKC1ZpZXdlclJvbGVzGAggAygJUgtWaWV3ZXJSb2xlczoekkEbChnSAQZIZWFkZXLSAQRDb2Rl'
    '0gEGRW50aXR5');

-@$core.Deprecated('Use updateAttachmentTypeOnSiteRequestDescriptor instead')
-const UpdateAttachmentTypeOnSiteRequest$json = {
-  '1': 'UpdateAttachmentTypeOnSiteRequest',
-  '2': [
-    {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.RequestSiteHeader', '8': {}, '10': 'Header'},
-    {
-      '1': 'Code',
-      '3': 2,
-      '4': 1,
-      '5': 9,
-      '8': {'3': true},
-      '10': 'Code',
-    },
-    {
-      '1': 'Entity',
-      '3': 3,
-      '4': 1,
-      '5': 14,
-      '6': '.api.EntityType',
-      '8': {'3': true},
-      '10': 'Entity',
-    },
-    {'1': 'Label', '3': 4, '4': 1, '5': 9, '10': 'Label'},
-    {'1': 'SharePolicy', '3': 5, '4': 1, '5': 14, '6': '.api.SharePolicy', '8': {}, '10': 'SharePolicy'},
-    {'1': 'ID', '3': 6, '4': 1, '5': 9, '8': {}, '10': 'ID'},
-    {'1': 'ManagerRoles', '3': 7, '4': 3, '5': 9, '10': 'ManagerRoles'},
-    {'1': 'ViewerRoles', '3': 8, '4': 3, '5': 9, '10': 'ViewerRoles'},
-  ],
-  '7': {},
-};
-
-/// Descriptor for `UpdateAttachmentTypeOnSiteRequest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List updateAttachmentTypeOnSiteRequestDescriptor = $convert.base64Decode(
-    'CiFVcGRhdGVBdHRhY2htZW50VHlwZU9uU2l0ZVJlcXVlc3QSOAoGSGVhZGVyGAEgASgLMhYuYX'
-    'BpLlJlcXVlc3RTaXRlSGVhZGVyQgj6QgWKAQIQAVIGSGVhZGVyEj8KBENvZGUYAiABKAlCKxgB'
-    'kkERigEOXlthLXpBLVowLTktXSr6QhJyEDIOXlthLXpBLVowLTktXSpSBENvZGUSMwoGRW50aX'
-    'R5GAMgASgOMg8uYXBpLkVudGl0eVR5cGVCChgB+kIFggECEAFSBkVudGl0eRIUCgVMYWJlbBgE'
-    'IAEoCVIFTGFiZWwSPAoLU2hhcmVQb2xpY3kYBSABKA4yEC5hcGkuU2hhcmVQb2xpY3lCCPpCBY'
-    'IBAhABUgtTaGFyZVBvbGljeRI5CgJJRBgGIAEoCUIpkkERigEOXlthLXpBLVowLTktXSr6QhJy'
-    'EDIOXlthLXpBLVowLTktXSpSAklEEiIKDE1hbmFnZXJSb2xlcxgHIAMoCVIMTWFuYWdlclJvbG'
-    'VzEiAKC1ZpZXdlclJvbGVzGAggAygJUgtWaWV3ZXJSb2xlczoekkEbChnSAQZIZWFkZXLSAQRD'
-    'b2Rl0gEGRW50aXR5');
-
@$core.Deprecated('Use updateAttachmentTypeResponseDescriptor instead')
 const UpdateAttachmentTypeResponse$json = {
  '1': 'UpdateAttachmentTypeResponse',
@@ -344,42 +222,6 @@ final $typed_data.Uint8List deleteAttachmentTypeRequestDescriptor = $convert.bas
    'kkERigEOXlthLXpBLVowLTktXSr6QhJyEDIOXlthLXpBLVowLTktXSpSAklEOh6SQRsKGdIBBk'
    'hlYWRlctIBBENvZGXSAQZFbnRpdHk=');

-@$core.Deprecated('Use deleteAttachmentTypeOnSiteRequestDescriptor instead')
-const DeleteAttachmentTypeOnSiteRequest$json = {
-  '1': 'DeleteAttachmentTypeOnSiteRequest',
-  '2': [
-    {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.RequestSiteHeader', '8': {}, '10': 'Header'},
-    {
-      '1': 'Code',
-      '3': 2,
-      '4': 1,
-      '5': 9,
-      '8': {'3': true},
-      '10': 'Code',
-    },
-    {
-      '1': 'Entity',
-      '3': 3,
-      '4': 1,
-      '5': 14,
-      '6': '.api.EntityType',
-      '8': {'3': true},
-      '10': 'Entity',
-    },
-    {'1': 'ID', '3': 4, '4': 1, '5': 9, '8': {}, '10': 'ID'},
-  ],
-  '7': {},
-};
-
-/// Descriptor for `DeleteAttachmentTypeOnSiteRequest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List deleteAttachmentTypeOnSiteRequestDescriptor = $convert.base64Decode(
-    'CiFEZWxldGVBdHRhY2htZW50VHlwZU9uU2l0ZVJlcXVlc3QSOAoGSGVhZGVyGAEgASgLMhYuYX'
-    'BpLlJlcXVlc3RTaXRlSGVhZGVyQgj6QgWKAQIQAVIGSGVhZGVyEj8KBENvZGUYAiABKAlCKxgB'
-    'kkERigEOXlthLXpBLVowLTktXSr6QhJyEDIOXlthLXpBLVowLTktXSpSBENvZGUSMwoGRW50aX'
-    'R5GAMgASgOMg8uYXBpLkVudGl0eVR5cGVCChgB+kIFggECEAFSBkVudGl0eRI5CgJJRBgEIAEo'
-    'CUIpkkERigEOXlthLXpBLVowLTktXSr6QhJyEDIOXlthLXpBLVowLTktXSpSAklEOh6SQRsKGd'
-    'IBBkhlYWRlctIBBENvZGXSAQZFbnRpdHk=');
-
@$core.Deprecated('Use deleteAttachmentTypeResponseDescriptor instead')
 const DeleteAttachmentTypeResponse$json = {
  '1': 'DeleteAttachmentTypeResponse',
@@ -403,21 +245,6 @@ final $typed_data.Uint8List deleteAllAttachmentsTypeRequestDescriptor = $convert
    'Ch9EZWxldGVBbGxBdHRhY2htZW50c1R5cGVSZXF1ZXN0EjsKBkhlYWRlchgBIAEoCzIZLmFwaS'
    '5SZXF1ZXN0UHJvamVjdEhlYWRlckII+kIFigECEAFSBkhlYWRlcjoOkkELCgnSAQZIZWFkZXI=');

-@$core.Deprecated('Use deleteAllAttachmentsTypeOnSiteRequestDescriptor instead')
-const DeleteAllAttachmentsTypeOnSiteRequest$json = {
-  '1': 'DeleteAllAttachmentsTypeOnSiteRequest',
-  '2': [
-    {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.RequestSiteHeader', '8': {}, '10': 'Header'},
-  ],
-  '7': {},
-};
-
-/// Descriptor for `DeleteAllAttachmentsTypeOnSiteRequest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List deleteAllAttachmentsTypeOnSiteRequestDescriptor = $convert.base64Decode(
-    'CiVEZWxldGVBbGxBdHRhY2htZW50c1R5cGVPblNpdGVSZXF1ZXN0EjgKBkhlYWRlchgBIAEoCz'
-    'IWLmFwaS5SZXF1ZXN0U2l0ZUhlYWRlckII+kIFigECEAFSBkhlYWRlcjoOkkELCgnSAQZIZWFk'
-    'ZXI=');
-
@$core.Deprecated('Use deleteAllAttachmentsTypeResponseDescriptor instead')
 const DeleteAllAttachmentsTypeResponse$json = {
  '1': 'DeleteAllAttachmentsTypeResponse',
--- a/lib/attachmentV2.pb.dart
+++ b/lib/attachmentV2.pb.dart
--- a/lib/attachmentV2.pbenum.dart
+++ b/lib/attachmentV2.pbenum.dart
@@ -1,14 +1,13 @@
-// This is a generated file - do not edit.
 //
-// Generated from attachmentV2.proto.
-
+//  Generated code. Do not modify.
+//  source: attachmentV2.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:core' as $core;

@@ -25,11 +24,11 @@ class AttachmentKind extends $pb.ProtobufEnum {
    ATTACHMENT_KIND_LINK,
  ];

-  static final $core.List<AttachmentKind?> _byValue = $pb.ProtobufEnum.$_initByValueList(values, 2);
-  static AttachmentKind? valueOf($core.int value) =>  value < 0 || value >= _byValue.length ? null : _byValue[value];
+  static final $core.Map<$core.int, AttachmentKind> _byValue = $pb.ProtobufEnum.initByValue(values);
+  static AttachmentKind? valueOf($core.int value) => _byValue[value];

-  const AttachmentKind._(super.value, super.name);
+  const AttachmentKind._(super.v, super.n);
 }


-const $core.bool _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names');
+const _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names');
--- a/lib/attachmentV2.pbgrpc.dart
+++ b/lib/attachmentV2.pbgrpc.dart
@@ -1,14 +1,13 @@
-// This is a generated file - do not edit.
 //
-// Generated from attachmentV2.proto.
-
+//  Generated code. Do not modify.
+//  source: attachmentV2.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:async' as $async;
 import 'dart:core' as $core;
@@ -16,96 +15,70 @@ import 'dart:core' as $core;
 import 'package:grpc/service_api.dart' as $grpc;
 import 'package:protobuf/protobuf.dart' as $pb;

-import 'attachmentV2.pb.dart' as $0;
+import 'attachmentV2.pb.dart' as $8;

 export 'attachmentV2.pb.dart';

@$pb.GrpcServiceName('api.AttachmentServiceV2')
 class AttachmentServiceV2Client extends $grpc.Client {
-  /// The hostname for this service.
-  static const $core.String defaultHost = '';
-
-  /// OAuth scopes needed for the client.
-  static const $core.List<$core.String> oauthScopes = [
-    '',
-  ];
+  static final _$upload = $grpc.ClientMethod<$8.UploadAttachmentV2Request, $8.UploadAttachmentV2Response>(
+      '/api.AttachmentServiceV2/Upload',
+      ($8.UploadAttachmentV2Request value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $8.UploadAttachmentV2Response.fromBuffer(value));
+  static final _$addLink = $grpc.ClientMethod<$8.AddLinkV2Request, $8.AddLinkV2Response>(
+      '/api.AttachmentServiceV2/AddLink',
+      ($8.AddLinkV2Request value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $8.AddLinkV2Response.fromBuffer(value));
+  static final _$download = $grpc.ClientMethod<$8.DownloadAttachmentV2Request, $8.DownloadAttachmentV2Response>(
+      '/api.AttachmentServiceV2/Download',
+      ($8.DownloadAttachmentV2Request value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $8.DownloadAttachmentV2Response.fromBuffer(value));
+  static final _$delete = $grpc.ClientMethod<$8.DeleteAttachmentV2Request, $8.DeleteAttachmentV2Response>(
+      '/api.AttachmentServiceV2/Delete',
+      ($8.DeleteAttachmentV2Request value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $8.DeleteAttachmentV2Response.fromBuffer(value));
+  static final _$list = $grpc.ClientMethod<$8.ListAttachmentsV2Request, $8.ListAttachmentsV2Response>(
+      '/api.AttachmentServiceV2/List',
+      ($8.ListAttachmentsV2Request value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $8.ListAttachmentsV2Response.fromBuffer(value));
+  static final _$share = $grpc.ClientMethod<$8.ShareAttachmentV2Request, $8.ShareAttachmentV2Response>(
+      '/api.AttachmentServiceV2/Share',
+      ($8.ShareAttachmentV2Request value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $8.ShareAttachmentV2Response.fromBuffer(value));
+  static final _$deleteAll = $grpc.ClientMethod<$8.DeleteAllAttachmentsV2Request, $8.DeleteAllAttachmentsV2Response>(
+      '/api.AttachmentServiceV2/DeleteAll',
+      ($8.DeleteAllAttachmentsV2Request value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $8.DeleteAllAttachmentsV2Response.fromBuffer(value));

  AttachmentServiceV2Client(super.channel, {super.options, super.interceptors});

-  $grpc.ResponseFuture<$0.UploadAttachmentV2Response> upload($0.UploadAttachmentV2Request request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$8.UploadAttachmentV2Response> upload($8.UploadAttachmentV2Request request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$upload, request, options: options);
  }

-  $grpc.ResponseFuture<$0.AddLinkV2Response> addLink($0.AddLinkV2Request request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$8.AddLinkV2Response> addLink($8.AddLinkV2Request request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$addLink, request, options: options);
  }

-  $grpc.ResponseFuture<$0.DownloadAttachmentV2Response> download($0.DownloadAttachmentV2Request request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$8.DownloadAttachmentV2Response> download($8.DownloadAttachmentV2Request request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$download, request, options: options);
  }

-  $grpc.ResponseFuture<$0.DeleteAttachmentV2Response> delete($0.DeleteAttachmentV2Request request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$8.DeleteAttachmentV2Response> delete($8.DeleteAttachmentV2Request request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$delete, request, options: options);
  }

-  $grpc.ResponseFuture<$0.ListAttachmentsV2Response> list($0.ListAttachmentsV2Request request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$8.ListAttachmentsV2Response> list($8.ListAttachmentsV2Request request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$list, request, options: options);
  }

-  $grpc.ResponseFuture<$0.ShareAttachmentV2Response> share($0.ShareAttachmentV2Request request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$8.ShareAttachmentV2Response> share($8.ShareAttachmentV2Request request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$share, request, options: options);
  }

-  $grpc.ResponseFuture<$0.DeleteAllAttachmentsV2Response> deleteAll($0.DeleteAllAttachmentsV2Request request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$8.DeleteAllAttachmentsV2Response> deleteAll($8.DeleteAllAttachmentsV2Request request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$deleteAll, request, options: options);
  }
-
-  $grpc.ResponseFuture<$0.ListAttachmentsOnSiteV2Response> listOnSite($0.ListAttachmentsOnSiteV2Request request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$listOnSite, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.DeleteAllAttachmentsV2Response> deleteAllSite($0.DeleteAllAttachmentsOnSiteV2Request request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$deleteAllSite, request, options: options);
-  }
-
-    // method descriptors
-
-  static final _$upload = $grpc.ClientMethod<$0.UploadAttachmentV2Request, $0.UploadAttachmentV2Response>(
-      '/api.AttachmentServiceV2/Upload',
-      ($0.UploadAttachmentV2Request value) => value.writeToBuffer(),
-      $0.UploadAttachmentV2Response.fromBuffer);
-  static final _$addLink = $grpc.ClientMethod<$0.AddLinkV2Request, $0.AddLinkV2Response>(
-      '/api.AttachmentServiceV2/AddLink',
-      ($0.AddLinkV2Request value) => value.writeToBuffer(),
-      $0.AddLinkV2Response.fromBuffer);
-  static final _$download = $grpc.ClientMethod<$0.DownloadAttachmentV2Request, $0.DownloadAttachmentV2Response>(
-      '/api.AttachmentServiceV2/Download',
-      ($0.DownloadAttachmentV2Request value) => value.writeToBuffer(),
-      $0.DownloadAttachmentV2Response.fromBuffer);
-  static final _$delete = $grpc.ClientMethod<$0.DeleteAttachmentV2Request, $0.DeleteAttachmentV2Response>(
-      '/api.AttachmentServiceV2/Delete',
-      ($0.DeleteAttachmentV2Request value) => value.writeToBuffer(),
-      $0.DeleteAttachmentV2Response.fromBuffer);
-  static final _$list = $grpc.ClientMethod<$0.ListAttachmentsV2Request, $0.ListAttachmentsV2Response>(
-      '/api.AttachmentServiceV2/List',
-      ($0.ListAttachmentsV2Request value) => value.writeToBuffer(),
-      $0.ListAttachmentsV2Response.fromBuffer);
-  static final _$share = $grpc.ClientMethod<$0.ShareAttachmentV2Request, $0.ShareAttachmentV2Response>(
-      '/api.AttachmentServiceV2/Share',
-      ($0.ShareAttachmentV2Request value) => value.writeToBuffer(),
-      $0.ShareAttachmentV2Response.fromBuffer);
-  static final _$deleteAll = $grpc.ClientMethod<$0.DeleteAllAttachmentsV2Request, $0.DeleteAllAttachmentsV2Response>(
-      '/api.AttachmentServiceV2/DeleteAll',
-      ($0.DeleteAllAttachmentsV2Request value) => value.writeToBuffer(),
-      $0.DeleteAllAttachmentsV2Response.fromBuffer);
-  static final _$listOnSite = $grpc.ClientMethod<$0.ListAttachmentsOnSiteV2Request, $0.ListAttachmentsOnSiteV2Response>(
-      '/api.AttachmentServiceV2/ListOnSite',
-      ($0.ListAttachmentsOnSiteV2Request value) => value.writeToBuffer(),
-      $0.ListAttachmentsOnSiteV2Response.fromBuffer);
-  static final _$deleteAllSite = $grpc.ClientMethod<$0.DeleteAllAttachmentsOnSiteV2Request, $0.DeleteAllAttachmentsV2Response>(
-      '/api.AttachmentServiceV2/DeleteAllSite',
-      ($0.DeleteAllAttachmentsOnSiteV2Request value) => value.writeToBuffer(),
-      $0.DeleteAllAttachmentsV2Response.fromBuffer);
 }

@$pb.GrpcServiceName('api.AttachmentServiceV2')
@@ -113,123 +86,90 @@ abstract class AttachmentServiceV2ServiceBase extends $grpc.Service {
  $core.String get $name => 'api.AttachmentServiceV2';

  AttachmentServiceV2ServiceBase() {
-    $addMethod($grpc.ServiceMethod<$0.UploadAttachmentV2Request, $0.UploadAttachmentV2Response>(
+    $addMethod($grpc.ServiceMethod<$8.UploadAttachmentV2Request, $8.UploadAttachmentV2Response>(
        'Upload',
        upload_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.UploadAttachmentV2Request.fromBuffer(value),
-        ($0.UploadAttachmentV2Response value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.AddLinkV2Request, $0.AddLinkV2Response>(
+        ($core.List<$core.int> value) => $8.UploadAttachmentV2Request.fromBuffer(value),
+        ($8.UploadAttachmentV2Response value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$8.AddLinkV2Request, $8.AddLinkV2Response>(
        'AddLink',
        addLink_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.AddLinkV2Request.fromBuffer(value),
-        ($0.AddLinkV2Response value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.DownloadAttachmentV2Request, $0.DownloadAttachmentV2Response>(
+        ($core.List<$core.int> value) => $8.AddLinkV2Request.fromBuffer(value),
+        ($8.AddLinkV2Response value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$8.DownloadAttachmentV2Request, $8.DownloadAttachmentV2Response>(
        'Download',
        download_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.DownloadAttachmentV2Request.fromBuffer(value),
-        ($0.DownloadAttachmentV2Response value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.DeleteAttachmentV2Request, $0.DeleteAttachmentV2Response>(
+        ($core.List<$core.int> value) => $8.DownloadAttachmentV2Request.fromBuffer(value),
+        ($8.DownloadAttachmentV2Response value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$8.DeleteAttachmentV2Request, $8.DeleteAttachmentV2Response>(
        'Delete',
        delete_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.DeleteAttachmentV2Request.fromBuffer(value),
-        ($0.DeleteAttachmentV2Response value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.ListAttachmentsV2Request, $0.ListAttachmentsV2Response>(
+        ($core.List<$core.int> value) => $8.DeleteAttachmentV2Request.fromBuffer(value),
+        ($8.DeleteAttachmentV2Response value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$8.ListAttachmentsV2Request, $8.ListAttachmentsV2Response>(
        'List',
        list_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.ListAttachmentsV2Request.fromBuffer(value),
-        ($0.ListAttachmentsV2Response value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.ShareAttachmentV2Request, $0.ShareAttachmentV2Response>(
+        ($core.List<$core.int> value) => $8.ListAttachmentsV2Request.fromBuffer(value),
+        ($8.ListAttachmentsV2Response value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$8.ShareAttachmentV2Request, $8.ShareAttachmentV2Response>(
        'Share',
        share_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.ShareAttachmentV2Request.fromBuffer(value),
-        ($0.ShareAttachmentV2Response value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.DeleteAllAttachmentsV2Request, $0.DeleteAllAttachmentsV2Response>(
+        ($core.List<$core.int> value) => $8.ShareAttachmentV2Request.fromBuffer(value),
+        ($8.ShareAttachmentV2Response value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$8.DeleteAllAttachmentsV2Request, $8.DeleteAllAttachmentsV2Response>(
        'DeleteAll',
        deleteAll_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.DeleteAllAttachmentsV2Request.fromBuffer(value),
-        ($0.DeleteAllAttachmentsV2Response value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.ListAttachmentsOnSiteV2Request, $0.ListAttachmentsOnSiteV2Response>(
-        'ListOnSite',
-        listOnSite_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $0.ListAttachmentsOnSiteV2Request.fromBuffer(value),
-        ($0.ListAttachmentsOnSiteV2Response value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.DeleteAllAttachmentsOnSiteV2Request, $0.DeleteAllAttachmentsV2Response>(
-        'DeleteAllSite',
-        deleteAllSite_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $0.DeleteAllAttachmentsOnSiteV2Request.fromBuffer(value),
-        ($0.DeleteAllAttachmentsV2Response value) => value.writeToBuffer()));
+        ($core.List<$core.int> value) => $8.DeleteAllAttachmentsV2Request.fromBuffer(value),
+        ($8.DeleteAllAttachmentsV2Response value) => value.writeToBuffer()));
  }

-  $async.Future<$0.UploadAttachmentV2Response> upload_Pre($grpc.ServiceCall $call, $async.Future<$0.UploadAttachmentV2Request> $request) async {
+  $async.Future<$8.UploadAttachmentV2Response> upload_Pre($grpc.ServiceCall $call, $async.Future<$8.UploadAttachmentV2Request> $request) async {
    return upload($call, await $request);
  }

-  $async.Future<$0.UploadAttachmentV2Response> upload($grpc.ServiceCall call, $0.UploadAttachmentV2Request request);
-
-  $async.Future<$0.AddLinkV2Response> addLink_Pre($grpc.ServiceCall $call, $async.Future<$0.AddLinkV2Request> $request) async {
+  $async.Future<$8.AddLinkV2Response> addLink_Pre($grpc.ServiceCall $call, $async.Future<$8.AddLinkV2Request> $request) async {
    return addLink($call, await $request);
  }

-  $async.Future<$0.AddLinkV2Response> addLink($grpc.ServiceCall call, $0.AddLinkV2Request request);
-
-  $async.Future<$0.DownloadAttachmentV2Response> download_Pre($grpc.ServiceCall $call, $async.Future<$0.DownloadAttachmentV2Request> $request) async {
+  $async.Future<$8.DownloadAttachmentV2Response> download_Pre($grpc.ServiceCall $call, $async.Future<$8.DownloadAttachmentV2Request> $request) async {
    return download($call, await $request);
  }

-  $async.Future<$0.DownloadAttachmentV2Response> download($grpc.ServiceCall call, $0.DownloadAttachmentV2Request request);
-
-  $async.Future<$0.DeleteAttachmentV2Response> delete_Pre($grpc.ServiceCall $call, $async.Future<$0.DeleteAttachmentV2Request> $request) async {
+  $async.Future<$8.DeleteAttachmentV2Response> delete_Pre($grpc.ServiceCall $call, $async.Future<$8.DeleteAttachmentV2Request> $request) async {
    return delete($call, await $request);
  }

-  $async.Future<$0.DeleteAttachmentV2Response> delete($grpc.ServiceCall call, $0.DeleteAttachmentV2Request request);
-
-  $async.Future<$0.ListAttachmentsV2Response> list_Pre($grpc.ServiceCall $call, $async.Future<$0.ListAttachmentsV2Request> $request) async {
+  $async.Future<$8.ListAttachmentsV2Response> list_Pre($grpc.ServiceCall $call, $async.Future<$8.ListAttachmentsV2Request> $request) async {
    return list($call, await $request);
  }

-  $async.Future<$0.ListAttachmentsV2Response> list($grpc.ServiceCall call, $0.ListAttachmentsV2Request request);
-
-  $async.Future<$0.ShareAttachmentV2Response> share_Pre($grpc.ServiceCall $call, $async.Future<$0.ShareAttachmentV2Request> $request) async {
+  $async.Future<$8.ShareAttachmentV2Response> share_Pre($grpc.ServiceCall $call, $async.Future<$8.ShareAttachmentV2Request> $request) async {
    return share($call, await $request);
  }

-  $async.Future<$0.ShareAttachmentV2Response> share($grpc.ServiceCall call, $0.ShareAttachmentV2Request request);
-
-  $async.Future<$0.DeleteAllAttachmentsV2Response> deleteAll_Pre($grpc.ServiceCall $call, $async.Future<$0.DeleteAllAttachmentsV2Request> $request) async {
+  $async.Future<$8.DeleteAllAttachmentsV2Response> deleteAll_Pre($grpc.ServiceCall $call, $async.Future<$8.DeleteAllAttachmentsV2Request> $request) async {
    return deleteAll($call, await $request);
  }

-  $async.Future<$0.DeleteAllAttachmentsV2Response> deleteAll($grpc.ServiceCall call, $0.DeleteAllAttachmentsV2Request request);
-
-  $async.Future<$0.ListAttachmentsOnSiteV2Response> listOnSite_Pre($grpc.ServiceCall $call, $async.Future<$0.ListAttachmentsOnSiteV2Request> $request) async {
-    return listOnSite($call, await $request);
-  }
-
-  $async.Future<$0.ListAttachmentsOnSiteV2Response> listOnSite($grpc.ServiceCall call, $0.ListAttachmentsOnSiteV2Request request);
-
-  $async.Future<$0.DeleteAllAttachmentsV2Response> deleteAllSite_Pre($grpc.ServiceCall $call, $async.Future<$0.DeleteAllAttachmentsOnSiteV2Request> $request) async {
-    return deleteAllSite($call, await $request);
-  }
-
-  $async.Future<$0.DeleteAllAttachmentsV2Response> deleteAllSite($grpc.ServiceCall call, $0.DeleteAllAttachmentsOnSiteV2Request request);
-
+  $async.Future<$8.UploadAttachmentV2Response> upload($grpc.ServiceCall call, $8.UploadAttachmentV2Request request);
+  $async.Future<$8.AddLinkV2Response> addLink($grpc.ServiceCall call, $8.AddLinkV2Request request);
+  $async.Future<$8.DownloadAttachmentV2Response> download($grpc.ServiceCall call, $8.DownloadAttachmentV2Request request);
+  $async.Future<$8.DeleteAttachmentV2Response> delete($grpc.ServiceCall call, $8.DeleteAttachmentV2Request request);
+  $async.Future<$8.ListAttachmentsV2Response> list($grpc.ServiceCall call, $8.ListAttachmentsV2Request request);
+  $async.Future<$8.ShareAttachmentV2Response> share($grpc.ServiceCall call, $8.ShareAttachmentV2Request request);
+  $async.Future<$8.DeleteAllAttachmentsV2Response> deleteAll($grpc.ServiceCall call, $8.DeleteAllAttachmentsV2Request request);
 }
--- a/lib/attachmentV2.pbjson.dart
+++ b/lib/attachmentV2.pbjson.dart
@@ -1,14 +1,13 @@
-// This is a generated file - do not edit.
 //
-// Generated from attachmentV2.proto.
-
+//  Generated code. Do not modify.
+//  source: attachmentV2.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
@@ -33,6 +32,7 @@ final $typed_data.Uint8List attachmentKindDescriptor = $convert.base64Decode(
 const Attachment$json = {
  '1': 'Attachment',
  '2': [
+    {'1': 'ProjectID', '3': 1, '4': 1, '5': 9, '8': {}, '10': 'ProjectID'},
    {'1': 'Name', '3': 2, '4': 1, '5': 9, '8': {}, '10': 'Name'},
    {'1': 'EntityRefID', '3': 3, '4': 1, '5': 9, '8': {}, '10': 'EntityRefID'},
    {'1': 'AttachmentType', '3': 4, '4': 1, '5': 11, '6': '.api.AttachmentType', '8': {}, '10': 'AttachmentType'},
@@ -41,30 +41,58 @@ const Attachment$json = {
    {'1': 'UploadedAt', '3': 11, '4': 1, '5': 9, '8': {}, '10': 'UploadedAt'},
    {'1': 'Kind', '3': 12, '4': 1, '5': 14, '6': '.api.AttachmentKind', '8': {}, '10': 'Kind'},
    {'1': 'WebURI', '3': 13, '4': 1, '5': 9, '8': {}, '10': 'WebURI'},
-    {'1': 'ResourceType', '3': 14, '4': 1, '5': 14, '6': '.api.ResourceType', '8': {}, '10': 'ResourceType'},
-    {'1': 'ResourceID', '3': 15, '4': 1, '5': 9, '8': {}, '10': 'ResourceID'},
  ],
 };

 /// Descriptor for `Attachment`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List attachmentDescriptor = $convert.base64Decode(
-    'CgpBdHRhY2htZW50EhsKBE5hbWUYAiABKAlCB/pCBHICEAFSBE5hbWUSKQoLRW50aXR5UmVmSU'
-    'QYAyABKAlCB/pCBHICEAFSC0VudGl0eVJlZklEEkUKDkF0dGFjaG1lbnRUeXBlGAQgASgLMhMu'
-    'YXBpLkF0dGFjaG1lbnRUeXBlQgj6QgWKAQIQAVIOQXR0YWNobWVudFR5cGUSxAEKA1VSSRgFIA'
-    'EoCUKxAZJBpgEyowFVUkkgb2YgdGhlIGF0dGFjaG1lbnQgdGhyb3VnaCB3aGljaCBpdCBjYW4g'
-    'YmUgZG93bmxvYWRlZCAobXVzdCBiZSBhdXRoZW50aWNhdGVkIHdpdGggYSBiZWFyZXIgdG9rZW'
-    '4pLiBJbiBjYXNlIHRoZSBBdHRhY2htZW50IGlzIGEgbGluaywgdGhlIFVSSSBpcyB0aGUgbGlu'
-    'ayBpdHNlbGYu+kIEcgIQAVIDVVJJEiMKCE1JTUVUeXBlGAYgASgJQgf6QgRyAhABUghNSU1FVH'
-    'lwZRKCAQoKVXBsb2FkZWRBdBgLIAEoCUJikkFXMlVVVEMgZGF0ZS90aW1lIGluIDxhIGhyZWY9'
-    'J2h0dHBzOi8vZW4ud2lraXBlZGlhLm9yZy93aWtpL0lTT184NjAxJz5JU08gODYwMTwvYT4gZm'
-    '9ybWF0+kIFcgPQAQFSClVwbG9hZGVkQXQSUwoES2luZBgMIAEoDjITLmFwaS5BdHRhY2htZW50'
-    'S2luZEIqkkEnMiVLaW5kIG9mIHRoZSBhdHRhY2htZW50IChmaWxlIG9yIGxpbmspUgRLaW5kEq'
-    '4BCgZXZWJVUkkYDSABKAlClQGSQYoBMocBVVJJIG9mIHRoZSBhdHRhY2htZW50IHRocm91Z2gg'
-    'd2hpY2ggaXQgY2FuIGJlIGFjY2Vzc2VkIG9uIGFuIGF1dGhlbnRpY2F0ZWQgd2ViIGFwcC4gSW'
-    '4gY2FzZSB0aGUgQXR0YWNobWVudCBpcyBhIGxpbmssIHRoZSBVUkkgaXMgZW1wdHku+kIEcgIQ'
-    'AVIGV2ViVVJJEj8KDFJlc291cmNlVHlwZRgOIAEoDjIRLmFwaS5SZXNvdXJjZVR5cGVCCPpCBY'
-    'IBAhABUgxSZXNvdXJjZVR5cGUSJwoKUmVzb3VyY2VJRBgPIAEoCUIH+kIEcgIQAVIKUmVzb3Vy'
-    'Y2VJRA==');
+    'CgpBdHRhY2htZW50EiUKCVByb2plY3RJRBgBIAEoCUIH+kIEcgIQAVIJUHJvamVjdElEEhsKBE'
+    '5hbWUYAiABKAlCB/pCBHICEAFSBE5hbWUSKQoLRW50aXR5UmVmSUQYAyABKAlCB/pCBHICEAFS'
+    'C0VudGl0eVJlZklEEkUKDkF0dGFjaG1lbnRUeXBlGAQgASgLMhMuYXBpLkF0dGFjaG1lbnRUeX'
+    'BlQgj6QgWKAQIQAVIOQXR0YWNobWVudFR5cGUSxAEKA1VSSRgFIAEoCUKxAZJBpgEyowFVUkkg'
+    'b2YgdGhlIGF0dGFjaG1lbnQgdGhyb3VnaCB3aGljaCBpdCBjYW4gYmUgZG93bmxvYWRlZCAobX'
+    'VzdCBiZSBhdXRoZW50aWNhdGVkIHdpdGggYSBiZWFyZXIgdG9rZW4pLiBJbiBjYXNlIHRoZSBB'
+    'dHRhY2htZW50IGlzIGEgbGluaywgdGhlIFVSSSBpcyB0aGUgbGluayBpdHNlbGYu+kIEcgIQAV'
+    'IDVVJJEiMKCE1JTUVUeXBlGAYgASgJQgf6QgRyAhABUghNSU1FVHlwZRKCAQoKVXBsb2FkZWRB'
+    'dBgLIAEoCUJikkFXMlVVVEMgZGF0ZS90aW1lIGluIDxhIGhyZWY9J2h0dHBzOi8vZW4ud2lraX'
+    'BlZGlhLm9yZy93aWtpL0lTT184NjAxJz5JU08gODYwMTwvYT4gZm9ybWF0+kIFcgPQAQFSClVw'
+    'bG9hZGVkQXQSUwoES2luZBgMIAEoDjITLmFwaS5BdHRhY2htZW50S2luZEIqkkEnMiVLaW5kIG'
+    '9mIHRoZSBhdHRhY2htZW50IChmaWxlIG9yIGxpbmspUgRLaW5kEq4BCgZXZWJVUkkYDSABKAlC'
+    'lQGSQYoBMocBVVJJIG9mIHRoZSBhdHRhY2htZW50IHRocm91Z2ggd2hpY2ggaXQgY2FuIGJlIG'
+    'FjY2Vzc2VkIG9uIGFuIGF1dGhlbnRpY2F0ZWQgd2ViIGFwcC4gSW4gY2FzZSB0aGUgQXR0YWNo'
+    'bWVudCBpcyBhIGxpbmssIHRoZSBVUkkgaXMgZW1wdHku+kIEcgIQAVIGV2ViVVJJ');
+
+@$core.Deprecated('Use fileDataRequestDescriptor instead')
+const FileDataRequest$json = {
+  '1': 'FileDataRequest',
+  '2': [
+    {'1': 'Name', '3': 1, '4': 1, '5': 9, '8': {}, '10': 'Name'},
+    {'1': 'Content', '3': 2, '4': 1, '5': 12, '10': 'Content'},
+  ],
+  '7': {},
+};
+
+/// Descriptor for `FileDataRequest`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List fileDataRequestDescriptor = $convert.base64Decode(
+    'Cg9GaWxlRGF0YVJlcXVlc3QSGwoETmFtZRgBIAEoCUIH+kIEcgIQAVIETmFtZRIYCgdDb250ZW'
+    '50GAIgASgMUgdDb250ZW50OgySQQkKB9IBBE5hbWU=');
+
+@$core.Deprecated('Use fileDataResponseDescriptor instead')
+const FileDataResponse$json = {
+  '1': 'FileDataResponse',
+  '2': [
+    {'1': 'Name', '3': 1, '4': 1, '5': 9, '10': 'Name'},
+    {'1': 'ContentType', '3': 2, '4': 1, '5': 9, '10': 'ContentType'},
+    {'1': 'Content', '3': 3, '4': 1, '5': 12, '10': 'Content'},
+  ],
+  '7': {},
+};
+
+/// Descriptor for `FileDataResponse`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List fileDataResponseDescriptor = $convert.base64Decode(
+    'ChBGaWxlRGF0YVJlc3BvbnNlEhIKBE5hbWUYASABKAlSBE5hbWUSIAoLQ29udGVudFR5cGUYAi'
+    'ABKAlSC0NvbnRlbnRUeXBlEhgKB0NvbnRlbnQYAyABKAxSB0NvbnRlbnQ6DJJBCQoH0gEETmFt'
+    'ZQ==');

@$core.Deprecated('Use downloadAttachmentV2RequestDescriptor instead')
 const DownloadAttachmentV2Request$json = {
@@ -246,42 +274,6 @@ final $typed_data.Uint8List listAttachmentsV2ResponseDescriptor = $convert.base6
    'bWVudHMYASADKAsyDy5hcGkuQXR0YWNobWVudEI4kkEtMitMaXN0IG9mIGF0dGFjaG1lbnRzIG'
    '1hdGNoaW5nIHRvIHRoZSByZXF1ZXN0+kIFkgECCAFSC0F0dGFjaG1lbnRz');

-@$core.Deprecated('Use listAttachmentsOnSiteV2RequestDescriptor instead')
-const ListAttachmentsOnSiteV2Request$json = {
-  '1': 'ListAttachmentsOnSiteV2Request',
-  '2': [
-    {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.RequestSiteHeader', '8': {}, '10': 'Header'},
-    {'1': 'EntityRefID', '3': 3, '4': 1, '5': 9, '8': {}, '10': 'EntityRefID'},
-    {'1': 'EntityType', '3': 4, '4': 1, '5': 14, '6': '.api.EntityType', '8': {}, '10': 'EntityType'},
-  ],
-  '7': {},
-};
-
-/// Descriptor for `ListAttachmentsOnSiteV2Request`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List listAttachmentsOnSiteV2RequestDescriptor = $convert.base64Decode(
-    'Ch5MaXN0QXR0YWNobWVudHNPblNpdGVWMlJlcXVlc3QSOAoGSGVhZGVyGAEgASgLMhYuYXBpLl'
-    'JlcXVlc3RTaXRlSGVhZGVyQgj6QgWKAQIQAVIGSGVhZGVyEmoKC0VudGl0eVJlZklEGAMgASgJ'
-    'QkiSQUUyQ09wdGlvbmFsIDogSWRlbnRpZmllciBvZiB0aGUgZW50aXR5IHdoZXJlIHRoZSBhdH'
-    'RhY2htZW50IGlzIGxvY2F0ZWRSC0VudGl0eVJlZklEEnMKCkVudGl0eVR5cGUYBCABKA4yDy5h'
-    'cGkuRW50aXR5VHlwZUJCkkE/Mj1PcHRpb25hbCA6IFR5cGUgb2YgdGhlIGVudGl0eSB3aGVyZS'
-    'B0aGUgYXR0YWNobWVudCBpcyBsb2NhdGVkUgpFbnRpdHlUeXBlOg6SQQsKCdIBBkhlYWRlcg==');
-
-@$core.Deprecated('Use listAttachmentsOnSiteV2ResponseDescriptor instead')
-const ListAttachmentsOnSiteV2Response$json = {
-  '1': 'ListAttachmentsOnSiteV2Response',
-  '2': [
-    {'1': 'Header', '3': 2, '4': 1, '5': 11, '6': '.api.ResponseSiteHeader', '8': {}, '10': 'Header'},
-    {'1': 'Attachments', '3': 1, '4': 3, '5': 11, '6': '.api.Attachment', '8': {}, '10': 'Attachments'},
-  ],
-};
-
-/// Descriptor for `ListAttachmentsOnSiteV2Response`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List listAttachmentsOnSiteV2ResponseDescriptor = $convert.base64Decode(
-    'Ch9MaXN0QXR0YWNobWVudHNPblNpdGVWMlJlc3BvbnNlEkwKBkhlYWRlchgCIAEoCzIXLmFwaS'
-    '5SZXNwb25zZVNpdGVIZWFkZXJCG5JBGDIWSGVhZGVyIG9mIHRoZSByZXNwb25zZVIGSGVhZGVy'
-    'EmsKC0F0dGFjaG1lbnRzGAEgAygLMg8uYXBpLkF0dGFjaG1lbnRCOJJBLTIrTGlzdCBvZiBhdH'
-    'RhY2htZW50cyBtYXRjaGluZyB0byB0aGUgcmVxdWVzdPpCBZIBAggBUgtBdHRhY2htZW50cw==');
-
@$core.Deprecated('Use shareAttachmentV2RequestDescriptor instead')
 const ShareAttachmentV2Request$json = {
  '1': 'ShareAttachmentV2Request',
@@ -332,20 +324,6 @@ final $typed_data.Uint8List deleteAllAttachmentsV2RequestDescriptor = $convert.b
    'Ch1EZWxldGVBbGxBdHRhY2htZW50c1YyUmVxdWVzdBI7CgZIZWFkZXIYASABKAsyGS5hcGkuUm'
    'VxdWVzdFByb2plY3RIZWFkZXJCCPpCBYoBAhABUgZIZWFkZXI6DpJBCwoJ0gEGSGVhZGVy');

-@$core.Deprecated('Use deleteAllAttachmentsOnSiteV2RequestDescriptor instead')
-const DeleteAllAttachmentsOnSiteV2Request$json = {
-  '1': 'DeleteAllAttachmentsOnSiteV2Request',
-  '2': [
-    {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.RequestSiteHeader', '8': {}, '10': 'Header'},
-  ],
-  '7': {},
-};
-
-/// Descriptor for `DeleteAllAttachmentsOnSiteV2Request`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List deleteAllAttachmentsOnSiteV2RequestDescriptor = $convert.base64Decode(
-    'CiNEZWxldGVBbGxBdHRhY2htZW50c09uU2l0ZVYyUmVxdWVzdBI4CgZIZWFkZXIYASABKAsyFi'
-    '5hcGkuUmVxdWVzdFNpdGVIZWFkZXJCCPpCBYoBAhABUgZIZWFkZXI6DpJBCwoJ0gEGSGVhZGVy');
-
@$core.Deprecated('Use deleteAllAttachmentsV2ResponseDescriptor instead')
 const DeleteAllAttachmentsV2Response$json = {
  '1': 'DeleteAllAttachmentsV2Response',
--- a/lib/base.pb.dart
+++ b/lib/base.pb.dart
@@ -1,14 +1,13 @@
-// This is a generated file - do not edit.
 //
-// Generated from base.proto.
-
+//  Generated code. Do not modify.
+//  source: base.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:core' as $core;

@@ -31,26 +30,48 @@ class AdminAddress extends $pb.GeneratedMessage {
    $core.String? streetAddressThree,
    $core.String? plusCode,
  }) {
-    final result = create();
-    if (city != null) result.city = city;
-    if (countryCode != null) result.countryCode = countryCode;
-    if (geographicalCoordinates != null) result.geographicalCoordinates = geographicalCoordinates;
-    if (name != null) result.name = name;
-    if (pOBoxNumber != null) result.pOBoxNumber = pOBoxNumber;
-    if (postalCode != null) result.postalCode = postalCode;
-    if (provinceCode != null) result.provinceCode = provinceCode;
-    if (state != null) result.state = state;
-    if (streetAddressOne != null) result.streetAddressOne = streetAddressOne;
-    if (streetAddressTwo != null) result.streetAddressTwo = streetAddressTwo;
-    if (streetAddressThree != null) result.streetAddressThree = streetAddressThree;
-    if (plusCode != null) result.plusCode = plusCode;
-    return result;
+    final $result = create();
+    if (city != null) {
+      $result.city = city;
+    }
+    if (countryCode != null) {
+      $result.countryCode = countryCode;
+    }
+    if (geographicalCoordinates != null) {
+      $result.geographicalCoordinates = geographicalCoordinates;
+    }
+    if (name != null) {
+      $result.name = name;
+    }
+    if (pOBoxNumber != null) {
+      $result.pOBoxNumber = pOBoxNumber;
+    }
+    if (postalCode != null) {
+      $result.postalCode = postalCode;
+    }
+    if (provinceCode != null) {
+      $result.provinceCode = provinceCode;
+    }
+    if (state != null) {
+      $result.state = state;
+    }
+    if (streetAddressOne != null) {
+      $result.streetAddressOne = streetAddressOne;
+    }
+    if (streetAddressTwo != null) {
+      $result.streetAddressTwo = streetAddressTwo;
+    }
+    if (streetAddressThree != null) {
+      $result.streetAddressThree = streetAddressThree;
+    }
+    if (plusCode != null) {
+      $result.plusCode = plusCode;
+    }
+    return $result;
  }
-
-  AdminAddress._();
-
-  factory AdminAddress.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory AdminAddress.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  AdminAddress._() : super();
+  factory AdminAddress.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory AdminAddress.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'AdminAddress', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
    ..aOS(1, _omitFieldNames ? '' : 'City', protoName: 'City')
@@ -68,17 +89,21 @@ class AdminAddress extends $pb.GeneratedMessage {
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  AdminAddress clone() => AdminAddress()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  AdminAddress copyWith(void Function(AdminAddress) updates) => super.copyWith((message) => updates(message as AdminAddress)) as AdminAddress;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static AdminAddress create() => AdminAddress._();
-  @$core.override
  AdminAddress createEmptyInstance() => create();
  static $pb.PbList<AdminAddress> createRepeated() => $pb.PbList<AdminAddress>();
  @$core.pragma('dart2js:noInline')
@@ -88,7 +113,7 @@ class AdminAddress extends $pb.GeneratedMessage {
  @$pb.TagNumber(1)
  $core.String get city => $_getSZ(0);
  @$pb.TagNumber(1)
-  set city($core.String value) => $_setString(0, value);
+  set city($core.String v) { $_setString(0, v); }
  @$pb.TagNumber(1)
  $core.bool hasCity() => $_has(0);
  @$pb.TagNumber(1)
@@ -98,7 +123,7 @@ class AdminAddress extends $pb.GeneratedMessage {
  @$pb.TagNumber(2)
  $core.String get countryCode => $_getSZ(1);
  @$pb.TagNumber(2)
-  set countryCode($core.String value) => $_setString(1, value);
+  set countryCode($core.String v) { $_setString(1, v); }
  @$pb.TagNumber(2)
  $core.bool hasCountryCode() => $_has(1);
  @$pb.TagNumber(2)
@@ -107,7 +132,7 @@ class AdminAddress extends $pb.GeneratedMessage {
  @$pb.TagNumber(3)
  AdminGeographicalCoordinates get geographicalCoordinates => $_getN(2);
  @$pb.TagNumber(3)
-  set geographicalCoordinates(AdminGeographicalCoordinates value) => $_setField(3, value);
+  set geographicalCoordinates(AdminGeographicalCoordinates v) { $_setField(3, v); }
  @$pb.TagNumber(3)
  $core.bool hasGeographicalCoordinates() => $_has(2);
  @$pb.TagNumber(3)
@@ -118,7 +143,7 @@ class AdminAddress extends $pb.GeneratedMessage {
  @$pb.TagNumber(4)
  $core.String get name => $_getSZ(3);
  @$pb.TagNumber(4)
-  set name($core.String value) => $_setString(3, value);
+  set name($core.String v) { $_setString(3, v); }
  @$pb.TagNumber(4)
  $core.bool hasName() => $_has(3);
  @$pb.TagNumber(4)
@@ -127,7 +152,7 @@ class AdminAddress extends $pb.GeneratedMessage {
  @$pb.TagNumber(5)
  $core.String get pOBoxNumber => $_getSZ(4);
  @$pb.TagNumber(5)
-  set pOBoxNumber($core.String value) => $_setString(4, value);
+  set pOBoxNumber($core.String v) { $_setString(4, v); }
  @$pb.TagNumber(5)
  $core.bool hasPOBoxNumber() => $_has(4);
  @$pb.TagNumber(5)
@@ -136,7 +161,7 @@ class AdminAddress extends $pb.GeneratedMessage {
  @$pb.TagNumber(6)
  $core.String get postalCode => $_getSZ(5);
  @$pb.TagNumber(6)
-  set postalCode($core.String value) => $_setString(5, value);
+  set postalCode($core.String v) { $_setString(5, v); }
  @$pb.TagNumber(6)
  $core.bool hasPostalCode() => $_has(5);
  @$pb.TagNumber(6)
@@ -145,7 +170,7 @@ class AdminAddress extends $pb.GeneratedMessage {
  @$pb.TagNumber(7)
  $core.String get provinceCode => $_getSZ(6);
  @$pb.TagNumber(7)
-  set provinceCode($core.String value) => $_setString(6, value);
+  set provinceCode($core.String v) { $_setString(6, v); }
  @$pb.TagNumber(7)
  $core.bool hasProvinceCode() => $_has(6);
  @$pb.TagNumber(7)
@@ -154,7 +179,7 @@ class AdminAddress extends $pb.GeneratedMessage {
  @$pb.TagNumber(8)
  $core.String get state => $_getSZ(7);
  @$pb.TagNumber(8)
-  set state($core.String value) => $_setString(7, value);
+  set state($core.String v) { $_setString(7, v); }
  @$pb.TagNumber(8)
  $core.bool hasState() => $_has(7);
  @$pb.TagNumber(8)
@@ -163,7 +188,7 @@ class AdminAddress extends $pb.GeneratedMessage {
  @$pb.TagNumber(9)
  $core.String get streetAddressOne => $_getSZ(8);
  @$pb.TagNumber(9)
-  set streetAddressOne($core.String value) => $_setString(8, value);
+  set streetAddressOne($core.String v) { $_setString(8, v); }
  @$pb.TagNumber(9)
  $core.bool hasStreetAddressOne() => $_has(8);
  @$pb.TagNumber(9)
@@ -172,7 +197,7 @@ class AdminAddress extends $pb.GeneratedMessage {
  @$pb.TagNumber(10)
  $core.String get streetAddressTwo => $_getSZ(9);
  @$pb.TagNumber(10)
-  set streetAddressTwo($core.String value) => $_setString(9, value);
+  set streetAddressTwo($core.String v) { $_setString(9, v); }
  @$pb.TagNumber(10)
  $core.bool hasStreetAddressTwo() => $_has(9);
  @$pb.TagNumber(10)
@@ -181,7 +206,7 @@ class AdminAddress extends $pb.GeneratedMessage {
  @$pb.TagNumber(11)
  $core.String get streetAddressThree => $_getSZ(10);
  @$pb.TagNumber(11)
-  set streetAddressThree($core.String value) => $_setString(10, value);
+  set streetAddressThree($core.String v) { $_setString(10, v); }
  @$pb.TagNumber(11)
  $core.bool hasStreetAddressThree() => $_has(10);
  @$pb.TagNumber(11)
@@ -190,7 +215,7 @@ class AdminAddress extends $pb.GeneratedMessage {
  @$pb.TagNumber(12)
  $core.String get plusCode => $_getSZ(11);
  @$pb.TagNumber(12)
-  set plusCode($core.String value) => $_setString(11, value);
+  set plusCode($core.String v) { $_setString(11, v); }
  @$pb.TagNumber(12)
  $core.bool hasPlusCode() => $_has(11);
  @$pb.TagNumber(12)
@@ -204,16 +229,18 @@ class AdminGeographicalCoordinates extends $pb.GeneratedMessage {
    $core.String? latitude,
    $core.String? longitude,
  }) {
-    final result = create();
-    if (latitude != null) result.latitude = latitude;
-    if (longitude != null) result.longitude = longitude;
-    return result;
+    final $result = create();
+    if (latitude != null) {
+      $result.latitude = latitude;
+    }
+    if (longitude != null) {
+      $result.longitude = longitude;
+    }
+    return $result;
  }
-
-  AdminGeographicalCoordinates._();
-
-  factory AdminGeographicalCoordinates.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory AdminGeographicalCoordinates.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  AdminGeographicalCoordinates._() : super();
+  factory AdminGeographicalCoordinates.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory AdminGeographicalCoordinates.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'AdminGeographicalCoordinates', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
    ..aOS(1, _omitFieldNames ? '' : 'Latitude', protoName: 'Latitude')
@@ -221,17 +248,21 @@ class AdminGeographicalCoordinates extends $pb.GeneratedMessage {
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  AdminGeographicalCoordinates clone() => AdminGeographicalCoordinates()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  AdminGeographicalCoordinates copyWith(void Function(AdminGeographicalCoordinates) updates) => super.copyWith((message) => updates(message as AdminGeographicalCoordinates)) as AdminGeographicalCoordinates;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static AdminGeographicalCoordinates create() => AdminGeographicalCoordinates._();
-  @$core.override
  AdminGeographicalCoordinates createEmptyInstance() => create();
  static $pb.PbList<AdminGeographicalCoordinates> createRepeated() => $pb.PbList<AdminGeographicalCoordinates>();
  @$core.pragma('dart2js:noInline')
@@ -241,7 +272,7 @@ class AdminGeographicalCoordinates extends $pb.GeneratedMessage {
  @$pb.TagNumber(1)
  $core.String get latitude => $_getSZ(0);
  @$pb.TagNumber(1)
-  set latitude($core.String value) => $_setString(0, value);
+  set latitude($core.String v) { $_setString(0, v); }
  @$pb.TagNumber(1)
  $core.bool hasLatitude() => $_has(0);
  @$pb.TagNumber(1)
@@ -250,7 +281,7 @@ class AdminGeographicalCoordinates extends $pb.GeneratedMessage {
  @$pb.TagNumber(2)
  $core.String get longitude => $_getSZ(1);
  @$pb.TagNumber(2)
-  set longitude($core.String value) => $_setString(1, value);
+  set longitude($core.String v) { $_setString(1, v); }
  @$pb.TagNumber(2)
  $core.bool hasLongitude() => $_has(1);
  @$pb.TagNumber(2)
@@ -262,16 +293,18 @@ class Paging extends $pb.GeneratedMessage {
    $core.int? limit,
    $core.int? offset,
  }) {
-    final result = create();
-    if (limit != null) result.limit = limit;
-    if (offset != null) result.offset = offset;
-    return result;
+    final $result = create();
+    if (limit != null) {
+      $result.limit = limit;
+    }
+    if (offset != null) {
+      $result.offset = offset;
+    }
+    return $result;
  }
-
-  Paging._();
-
-  factory Paging.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory Paging.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  Paging._() : super();
+  factory Paging.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory Paging.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Paging', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
    ..a<$core.int>(1, _omitFieldNames ? '' : 'Limit', $pb.PbFieldType.O3, protoName: 'Limit')
@@ -279,17 +312,21 @@ class Paging extends $pb.GeneratedMessage {
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  Paging clone() => Paging()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  Paging copyWith(void Function(Paging) updates) => super.copyWith((message) => updates(message as Paging)) as Paging;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static Paging create() => Paging._();
-  @$core.override
  Paging createEmptyInstance() => create();
  static $pb.PbList<Paging> createRepeated() => $pb.PbList<Paging>();
  @$core.pragma('dart2js:noInline')
@@ -299,7 +336,7 @@ class Paging extends $pb.GeneratedMessage {
  @$pb.TagNumber(1)
  $core.int get limit => $_getIZ(0);
  @$pb.TagNumber(1)
-  set limit($core.int value) => $_setSignedInt32(0, value);
+  set limit($core.int v) { $_setSignedInt32(0, v); }
  @$pb.TagNumber(1)
  $core.bool hasLimit() => $_has(0);
  @$pb.TagNumber(1)
@@ -308,7 +345,7 @@ class Paging extends $pb.GeneratedMessage {
  @$pb.TagNumber(2)
  $core.int get offset => $_getIZ(1);
  @$pb.TagNumber(2)
-  set offset($core.int value) => $_setSignedInt32(1, value);
+  set offset($core.int v) { $_setSignedInt32(1, v); }
  @$pb.TagNumber(2)
  $core.bool hasOffset() => $_has(1);
  @$pb.TagNumber(2)
@@ -316,5 +353,5 @@ class Paging extends $pb.GeneratedMessage {
 }


-const $core.bool _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
-const $core.bool _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
+const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
+const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
--- a/lib/base.pbenum.dart
+++ b/lib/base.pbenum.dart
@@ -1,12 +1,11 @@
-// This is a generated file - do not edit.
 //
-// Generated from base.proto.
-
+//  Generated code. Do not modify.
+//  source: base.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

--- a/lib/base.pbjson.dart
+++ b/lib/base.pbjson.dart
@@ -1,14 +1,13 @@
-// This is a generated file - do not edit.
 //
-// Generated from base.proto.
-
+//  Generated code. Do not modify.
+//  source: base.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
--- a/lib/billing.pb.dart
+++ b/lib/billing.pb.dart
@@ -1,14 +1,13 @@
-// This is a generated file - do not edit.
 //
-// Generated from billing.proto.
-
+//  Generated code. Do not modify.
+//  source: billing.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:core' as $core;

@@ -28,19 +27,27 @@ class GenerateRequest extends $pb.GeneratedMessage {
    $core.String? toDate,
    GenerateBillingFormat? outputFormat,
  }) {
-    final result = create();
-    if (organisationID != null) result.organisationID = organisationID;
-    if (comment != null) result.comment = comment;
-    if (fromDate != null) result.fromDate = fromDate;
-    if (toDate != null) result.toDate = toDate;
-    if (outputFormat != null) result.outputFormat = outputFormat;
-    return result;
+    final $result = create();
+    if (organisationID != null) {
+      $result.organisationID = organisationID;
+    }
+    if (comment != null) {
+      $result.comment = comment;
+    }
+    if (fromDate != null) {
+      $result.fromDate = fromDate;
+    }
+    if (toDate != null) {
+      $result.toDate = toDate;
+    }
+    if (outputFormat != null) {
+      $result.outputFormat = outputFormat;
+    }
+    return $result;
  }
-
-  GenerateRequest._();
-
-  factory GenerateRequest.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory GenerateRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  GenerateRequest._() : super();
+  factory GenerateRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory GenerateRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GenerateRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
    ..aOS(1, _omitFieldNames ? '' : 'OrganisationID', protoName: 'OrganisationID')
@@ -51,17 +58,21 @@ class GenerateRequest extends $pb.GeneratedMessage {
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  GenerateRequest clone() => GenerateRequest()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  GenerateRequest copyWith(void Function(GenerateRequest) updates) => super.copyWith((message) => updates(message as GenerateRequest)) as GenerateRequest;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static GenerateRequest create() => GenerateRequest._();
-  @$core.override
  GenerateRequest createEmptyInstance() => create();
  static $pb.PbList<GenerateRequest> createRepeated() => $pb.PbList<GenerateRequest>();
  @$core.pragma('dart2js:noInline')
@@ -71,7 +82,7 @@ class GenerateRequest extends $pb.GeneratedMessage {
  @$pb.TagNumber(1)
  $core.String get organisationID => $_getSZ(0);
  @$pb.TagNumber(1)
-  set organisationID($core.String value) => $_setString(0, value);
+  set organisationID($core.String v) { $_setString(0, v); }
  @$pb.TagNumber(1)
  $core.bool hasOrganisationID() => $_has(0);
  @$pb.TagNumber(1)
@@ -80,7 +91,7 @@ class GenerateRequest extends $pb.GeneratedMessage {
  @$pb.TagNumber(2)
  $core.String get comment => $_getSZ(1);
  @$pb.TagNumber(2)
-  set comment($core.String value) => $_setString(1, value);
+  set comment($core.String v) { $_setString(1, v); }
  @$pb.TagNumber(2)
  $core.bool hasComment() => $_has(1);
  @$pb.TagNumber(2)
@@ -90,7 +101,7 @@ class GenerateRequest extends $pb.GeneratedMessage {
  @$pb.TagNumber(3)
  $core.String get fromDate => $_getSZ(2);
  @$pb.TagNumber(3)
-  set fromDate($core.String value) => $_setString(2, value);
+  set fromDate($core.String v) { $_setString(2, v); }
  @$pb.TagNumber(3)
  $core.bool hasFromDate() => $_has(2);
  @$pb.TagNumber(3)
@@ -100,7 +111,7 @@ class GenerateRequest extends $pb.GeneratedMessage {
  @$pb.TagNumber(4)
  $core.String get toDate => $_getSZ(3);
  @$pb.TagNumber(4)
-  set toDate($core.String value) => $_setString(3, value);
+  set toDate($core.String v) { $_setString(3, v); }
  @$pb.TagNumber(4)
  $core.bool hasToDate() => $_has(3);
  @$pb.TagNumber(4)
@@ -109,7 +120,7 @@ class GenerateRequest extends $pb.GeneratedMessage {
  @$pb.TagNumber(5)
  GenerateBillingFormat get outputFormat => $_getN(4);
  @$pb.TagNumber(5)
-  set outputFormat(GenerateBillingFormat value) => $_setField(5, value);
+  set outputFormat(GenerateBillingFormat v) { $_setField(5, v); }
  @$pb.TagNumber(5)
  $core.bool hasOutputFormat() => $_has(4);
  @$pb.TagNumber(5)
@@ -120,32 +131,36 @@ class GenerateResult extends $pb.GeneratedMessage {
  factory GenerateResult({
    $core.String? output,
  }) {
-    final result = create();
-    if (output != null) result.output = output;
-    return result;
+    final $result = create();
+    if (output != null) {
+      $result.output = output;
+    }
+    return $result;
  }
-
-  GenerateResult._();
-
-  factory GenerateResult.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory GenerateResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  GenerateResult._() : super();
+  factory GenerateResult.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory GenerateResult.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GenerateResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
    ..aOS(1, _omitFieldNames ? '' : 'Output', protoName: 'Output')
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  GenerateResult clone() => GenerateResult()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  GenerateResult copyWith(void Function(GenerateResult) updates) => super.copyWith((message) => updates(message as GenerateResult)) as GenerateResult;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static GenerateResult create() => GenerateResult._();
-  @$core.override
  GenerateResult createEmptyInstance() => create();
  static $pb.PbList<GenerateResult> createRepeated() => $pb.PbList<GenerateResult>();
  @$core.pragma('dart2js:noInline')
@@ -155,7 +170,7 @@ class GenerateResult extends $pb.GeneratedMessage {
  @$pb.TagNumber(1)
  $core.String get output => $_getSZ(0);
  @$pb.TagNumber(1)
-  set output($core.String value) => $_setString(0, value);
+  set output($core.String v) { $_setString(0, v); }
  @$pb.TagNumber(1)
  $core.bool hasOutput() => $_has(0);
  @$pb.TagNumber(1)
@@ -163,5 +178,5 @@ class GenerateResult extends $pb.GeneratedMessage {
 }


-const $core.bool _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
-const $core.bool _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
+const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
+const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
--- a/lib/billing.pbenum.dart
+++ b/lib/billing.pbenum.dart
@@ -1,14 +1,13 @@
-// This is a generated file - do not edit.
 //
-// Generated from billing.proto.
-
+//  Generated code. Do not modify.
+//  source: billing.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:core' as $core;

@@ -25,11 +24,11 @@ class GenerateBillingFormat extends $pb.ProtobufEnum {
    BILLING_FORMAT_JSON,
  ];

-  static final $core.List<GenerateBillingFormat?> _byValue = $pb.ProtobufEnum.$_initByValueList(values, 2);
-  static GenerateBillingFormat? valueOf($core.int value) =>  value < 0 || value >= _byValue.length ? null : _byValue[value];
+  static final $core.Map<$core.int, GenerateBillingFormat> _byValue = $pb.ProtobufEnum.initByValue(values);
+  static GenerateBillingFormat? valueOf($core.int value) => _byValue[value];

-  const GenerateBillingFormat._(super.value, super.name);
+  const GenerateBillingFormat._(super.v, super.n);
 }


-const $core.bool _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names');
+const _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names');
--- a/lib/billing.pbgrpc.dart
+++ b/lib/billing.pbgrpc.dart
@@ -1,14 +1,13 @@
-// This is a generated file - do not edit.
 //
-// Generated from billing.proto.
-
+//  Generated code. Do not modify.
+//  source: billing.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:async' as $async;
 import 'dart:core' as $core;
@@ -16,32 +15,22 @@ import 'dart:core' as $core;
 import 'package:grpc/service_api.dart' as $grpc;
 import 'package:protobuf/protobuf.dart' as $pb;

-import 'billing.pb.dart' as $0;
+import 'billing.pb.dart' as $9;

 export 'billing.pb.dart';

@$pb.GrpcServiceName('api.BillingService')
 class BillingServiceClient extends $grpc.Client {
-  /// The hostname for this service.
-  static const $core.String defaultHost = '';
-
-  /// OAuth scopes needed for the client.
-  static const $core.List<$core.String> oauthScopes = [
-    '',
-  ];
+  static final _$generate = $grpc.ClientMethod<$9.GenerateRequest, $9.GenerateResult>(
+      '/api.BillingService/Generate',
+      ($9.GenerateRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $9.GenerateResult.fromBuffer(value));

  BillingServiceClient(super.channel, {super.options, super.interceptors});

-  $grpc.ResponseFuture<$0.GenerateResult> generate($0.GenerateRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$9.GenerateResult> generate($9.GenerateRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$generate, request, options: options);
  }
-
-    // method descriptors
-
-  static final _$generate = $grpc.ClientMethod<$0.GenerateRequest, $0.GenerateResult>(
-      '/api.BillingService/Generate',
-      ($0.GenerateRequest value) => value.writeToBuffer(),
-      $0.GenerateResult.fromBuffer);
 }

@$pb.GrpcServiceName('api.BillingService')
@@ -49,19 +38,18 @@ abstract class BillingServiceBase extends $grpc.Service {
  $core.String get $name => 'api.BillingService';

  BillingServiceBase() {
-    $addMethod($grpc.ServiceMethod<$0.GenerateRequest, $0.GenerateResult>(
+    $addMethod($grpc.ServiceMethod<$9.GenerateRequest, $9.GenerateResult>(
        'Generate',
        generate_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.GenerateRequest.fromBuffer(value),
-        ($0.GenerateResult value) => value.writeToBuffer()));
+        ($core.List<$core.int> value) => $9.GenerateRequest.fromBuffer(value),
+        ($9.GenerateResult value) => value.writeToBuffer()));
  }

-  $async.Future<$0.GenerateResult> generate_Pre($grpc.ServiceCall $call, $async.Future<$0.GenerateRequest> $request) async {
+  $async.Future<$9.GenerateResult> generate_Pre($grpc.ServiceCall $call, $async.Future<$9.GenerateRequest> $request) async {
    return generate($call, await $request);
  }

-  $async.Future<$0.GenerateResult> generate($grpc.ServiceCall call, $0.GenerateRequest request);
-
+  $async.Future<$9.GenerateResult> generate($grpc.ServiceCall call, $9.GenerateRequest request);
 }
--- a/lib/billing.pbjson.dart
+++ b/lib/billing.pbjson.dart
@@ -1,14 +1,13 @@
-// This is a generated file - do not edit.
 //
-// Generated from billing.proto.
-
+//  Generated code. Do not modify.
+//  source: billing.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
--- a/lib/calendar.pb.dart
+++ b/lib/calendar.pb.dart
--- a/lib/calendar.pbenum.dart
+++ b/lib/calendar.pbenum.dart
@@ -1,12 +0,0 @@
-// This is a generated file - do not edit.
-//
-// Generated from calendar.proto.
-
-// @dart = 3.3
-
-// ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
-
--- a/lib/calendar.pbgrpc.dart
+++ b/lib/calendar.pbgrpc.dart
@@ -1,319 +0,0 @@
-// This is a generated file - do not edit.
-//
-// Generated from calendar.proto.
-
-// @dart = 3.3
-
-// ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
-
-import 'dart:async' as $async;
-import 'dart:core' as $core;
-
-import 'package:grpc/service_api.dart' as $grpc;
-import 'package:protobuf/protobuf.dart' as $pb;
-
-import 'calendar.pb.dart' as $0;
-
-export 'calendar.pb.dart';
-
-@$pb.GrpcServiceName('api.CalendarService')
-class CalendarServiceClient extends $grpc.Client {
-  /// The hostname for this service.
-  static const $core.String defaultHost = '';
-
-  /// OAuth scopes needed for the client.
-  static const $core.List<$core.String> oauthScopes = [
-    '',
-  ];
-
-  CalendarServiceClient(super.channel, {super.options, super.interceptors});
-
-  $grpc.ResponseFuture<$0.CreateOnOrganisationResponse> createOnOrganisation($0.CreateOnOrganisationRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$createOnOrganisation, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.GetOnOrganisationResponse> getOnOrganisation($0.GetOnOrganisationRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$getOnOrganisation, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.ListOnOrganisationResponse> listOnOrganisation($0.ListOnOrganisationRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$listOnOrganisation, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.UpdateOnOrganisationResponse> updateOnOrganisation($0.UpdateOnOrganisationRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$updateOnOrganisation, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.DeleteOnOrganisationResponse> deleteOnOrganisation($0.DeleteOnOrganisationRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$deleteOnOrganisation, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.ComputeETAPeriodOnOrganisationResponse> computeETAPeriodOnOrganisation($0.ComputeETAPeriodOnOrganisationRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$computeETAPeriodOnOrganisation, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.CreateOnSiteResponse> createOnSite($0.CreateOnSiteRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$createOnSite, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.GetOnSiteResponse> getOnSite($0.GetOnSiteRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$getOnSite, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.ListOnSiteResponse> listOnSite($0.ListOnSiteRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$listOnSite, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.UpdateOnSiteResponse> updateOnSite($0.UpdateOnSiteRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$updateOnSite, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.DeleteOnSiteResponse> deleteOnSite($0.DeleteOnSiteRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$deleteOnSite, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.GetPublicHolidaysResponse> getPublicHolidays($0.GetPublicHolidaysRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$getPublicHolidays, request, options: options);
-  }
-
-  $grpc.ResponseFuture<$0.ComputeETAPeriodOnSiteResponse> computeETAPeriodOnSite($0.ComputeETAPeriodOnSiteRequest request, {$grpc.CallOptions? options,}) {
-    return $createUnaryCall(_$computeETAPeriodOnSite, request, options: options);
-  }
-
-    // method descriptors
-
-  static final _$createOnOrganisation = $grpc.ClientMethod<$0.CreateOnOrganisationRequest, $0.CreateOnOrganisationResponse>(
-      '/api.CalendarService/CreateOnOrganisation',
-      ($0.CreateOnOrganisationRequest value) => value.writeToBuffer(),
-      $0.CreateOnOrganisationResponse.fromBuffer);
-  static final _$getOnOrganisation = $grpc.ClientMethod<$0.GetOnOrganisationRequest, $0.GetOnOrganisationResponse>(
-      '/api.CalendarService/GetOnOrganisation',
-      ($0.GetOnOrganisationRequest value) => value.writeToBuffer(),
-      $0.GetOnOrganisationResponse.fromBuffer);
-  static final _$listOnOrganisation = $grpc.ClientMethod<$0.ListOnOrganisationRequest, $0.ListOnOrganisationResponse>(
-      '/api.CalendarService/ListOnOrganisation',
-      ($0.ListOnOrganisationRequest value) => value.writeToBuffer(),
-      $0.ListOnOrganisationResponse.fromBuffer);
-  static final _$updateOnOrganisation = $grpc.ClientMethod<$0.UpdateOnOrganisationRequest, $0.UpdateOnOrganisationResponse>(
-      '/api.CalendarService/UpdateOnOrganisation',
-      ($0.UpdateOnOrganisationRequest value) => value.writeToBuffer(),
-      $0.UpdateOnOrganisationResponse.fromBuffer);
-  static final _$deleteOnOrganisation = $grpc.ClientMethod<$0.DeleteOnOrganisationRequest, $0.DeleteOnOrganisationResponse>(
-      '/api.CalendarService/DeleteOnOrganisation',
-      ($0.DeleteOnOrganisationRequest value) => value.writeToBuffer(),
-      $0.DeleteOnOrganisationResponse.fromBuffer);
-  static final _$computeETAPeriodOnOrganisation = $grpc.ClientMethod<$0.ComputeETAPeriodOnOrganisationRequest, $0.ComputeETAPeriodOnOrganisationResponse>(
-      '/api.CalendarService/ComputeETAPeriodOnOrganisation',
-      ($0.ComputeETAPeriodOnOrganisationRequest value) => value.writeToBuffer(),
-      $0.ComputeETAPeriodOnOrganisationResponse.fromBuffer);
-  static final _$createOnSite = $grpc.ClientMethod<$0.CreateOnSiteRequest, $0.CreateOnSiteResponse>(
-      '/api.CalendarService/CreateOnSite',
-      ($0.CreateOnSiteRequest value) => value.writeToBuffer(),
-      $0.CreateOnSiteResponse.fromBuffer);
-  static final _$getOnSite = $grpc.ClientMethod<$0.GetOnSiteRequest, $0.GetOnSiteResponse>(
-      '/api.CalendarService/GetOnSite',
-      ($0.GetOnSiteRequest value) => value.writeToBuffer(),
-      $0.GetOnSiteResponse.fromBuffer);
-  static final _$listOnSite = $grpc.ClientMethod<$0.ListOnSiteRequest, $0.ListOnSiteResponse>(
-      '/api.CalendarService/ListOnSite',
-      ($0.ListOnSiteRequest value) => value.writeToBuffer(),
-      $0.ListOnSiteResponse.fromBuffer);
-  static final _$updateOnSite = $grpc.ClientMethod<$0.UpdateOnSiteRequest, $0.UpdateOnSiteResponse>(
-      '/api.CalendarService/UpdateOnSite',
-      ($0.UpdateOnSiteRequest value) => value.writeToBuffer(),
-      $0.UpdateOnSiteResponse.fromBuffer);
-  static final _$deleteOnSite = $grpc.ClientMethod<$0.DeleteOnSiteRequest, $0.DeleteOnSiteResponse>(
-      '/api.CalendarService/DeleteOnSite',
-      ($0.DeleteOnSiteRequest value) => value.writeToBuffer(),
-      $0.DeleteOnSiteResponse.fromBuffer);
-  static final _$getPublicHolidays = $grpc.ClientMethod<$0.GetPublicHolidaysRequest, $0.GetPublicHolidaysResponse>(
-      '/api.CalendarService/GetPublicHolidays',
-      ($0.GetPublicHolidaysRequest value) => value.writeToBuffer(),
-      $0.GetPublicHolidaysResponse.fromBuffer);
-  static final _$computeETAPeriodOnSite = $grpc.ClientMethod<$0.ComputeETAPeriodOnSiteRequest, $0.ComputeETAPeriodOnSiteResponse>(
-      '/api.CalendarService/ComputeETAPeriodOnSite',
-      ($0.ComputeETAPeriodOnSiteRequest value) => value.writeToBuffer(),
-      $0.ComputeETAPeriodOnSiteResponse.fromBuffer);
-}
-
-@$pb.GrpcServiceName('api.CalendarService')
-abstract class CalendarServiceBase extends $grpc.Service {
-  $core.String get $name => 'api.CalendarService';
-
-  CalendarServiceBase() {
-    $addMethod($grpc.ServiceMethod<$0.CreateOnOrganisationRequest, $0.CreateOnOrganisationResponse>(
-        'CreateOnOrganisation',
-        createOnOrganisation_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $0.CreateOnOrganisationRequest.fromBuffer(value),
-        ($0.CreateOnOrganisationResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.GetOnOrganisationRequest, $0.GetOnOrganisationResponse>(
-        'GetOnOrganisation',
-        getOnOrganisation_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $0.GetOnOrganisationRequest.fromBuffer(value),
-        ($0.GetOnOrganisationResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.ListOnOrganisationRequest, $0.ListOnOrganisationResponse>(
-        'ListOnOrganisation',
-        listOnOrganisation_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $0.ListOnOrganisationRequest.fromBuffer(value),
-        ($0.ListOnOrganisationResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.UpdateOnOrganisationRequest, $0.UpdateOnOrganisationResponse>(
-        'UpdateOnOrganisation',
-        updateOnOrganisation_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $0.UpdateOnOrganisationRequest.fromBuffer(value),
-        ($0.UpdateOnOrganisationResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.DeleteOnOrganisationRequest, $0.DeleteOnOrganisationResponse>(
-        'DeleteOnOrganisation',
-        deleteOnOrganisation_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $0.DeleteOnOrganisationRequest.fromBuffer(value),
-        ($0.DeleteOnOrganisationResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.ComputeETAPeriodOnOrganisationRequest, $0.ComputeETAPeriodOnOrganisationResponse>(
-        'ComputeETAPeriodOnOrganisation',
-        computeETAPeriodOnOrganisation_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $0.ComputeETAPeriodOnOrganisationRequest.fromBuffer(value),
-        ($0.ComputeETAPeriodOnOrganisationResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.CreateOnSiteRequest, $0.CreateOnSiteResponse>(
-        'CreateOnSite',
-        createOnSite_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $0.CreateOnSiteRequest.fromBuffer(value),
-        ($0.CreateOnSiteResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.GetOnSiteRequest, $0.GetOnSiteResponse>(
-        'GetOnSite',
-        getOnSite_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $0.GetOnSiteRequest.fromBuffer(value),
-        ($0.GetOnSiteResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.ListOnSiteRequest, $0.ListOnSiteResponse>(
-        'ListOnSite',
-        listOnSite_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $0.ListOnSiteRequest.fromBuffer(value),
-        ($0.ListOnSiteResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.UpdateOnSiteRequest, $0.UpdateOnSiteResponse>(
-        'UpdateOnSite',
-        updateOnSite_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $0.UpdateOnSiteRequest.fromBuffer(value),
-        ($0.UpdateOnSiteResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.DeleteOnSiteRequest, $0.DeleteOnSiteResponse>(
-        'DeleteOnSite',
-        deleteOnSite_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $0.DeleteOnSiteRequest.fromBuffer(value),
-        ($0.DeleteOnSiteResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.GetPublicHolidaysRequest, $0.GetPublicHolidaysResponse>(
-        'GetPublicHolidays',
-        getPublicHolidays_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $0.GetPublicHolidaysRequest.fromBuffer(value),
-        ($0.GetPublicHolidaysResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.ComputeETAPeriodOnSiteRequest, $0.ComputeETAPeriodOnSiteResponse>(
-        'ComputeETAPeriodOnSite',
-        computeETAPeriodOnSite_Pre,
-        false,
-        false,
-        ($core.List<$core.int> value) => $0.ComputeETAPeriodOnSiteRequest.fromBuffer(value),
-        ($0.ComputeETAPeriodOnSiteResponse value) => value.writeToBuffer()));
-  }
-
-  $async.Future<$0.CreateOnOrganisationResponse> createOnOrganisation_Pre($grpc.ServiceCall $call, $async.Future<$0.CreateOnOrganisationRequest> $request) async {
-    return createOnOrganisation($call, await $request);
-  }
-
-  $async.Future<$0.CreateOnOrganisationResponse> createOnOrganisation($grpc.ServiceCall call, $0.CreateOnOrganisationRequest request);
-
-  $async.Future<$0.GetOnOrganisationResponse> getOnOrganisation_Pre($grpc.ServiceCall $call, $async.Future<$0.GetOnOrganisationRequest> $request) async {
-    return getOnOrganisation($call, await $request);
-  }
-
-  $async.Future<$0.GetOnOrganisationResponse> getOnOrganisation($grpc.ServiceCall call, $0.GetOnOrganisationRequest request);
-
-  $async.Future<$0.ListOnOrganisationResponse> listOnOrganisation_Pre($grpc.ServiceCall $call, $async.Future<$0.ListOnOrganisationRequest> $request) async {
-    return listOnOrganisation($call, await $request);
-  }
-
-  $async.Future<$0.ListOnOrganisationResponse> listOnOrganisation($grpc.ServiceCall call, $0.ListOnOrganisationRequest request);
-
-  $async.Future<$0.UpdateOnOrganisationResponse> updateOnOrganisation_Pre($grpc.ServiceCall $call, $async.Future<$0.UpdateOnOrganisationRequest> $request) async {
-    return updateOnOrganisation($call, await $request);
-  }
-
-  $async.Future<$0.UpdateOnOrganisationResponse> updateOnOrganisation($grpc.ServiceCall call, $0.UpdateOnOrganisationRequest request);
-
-  $async.Future<$0.DeleteOnOrganisationResponse> deleteOnOrganisation_Pre($grpc.ServiceCall $call, $async.Future<$0.DeleteOnOrganisationRequest> $request) async {
-    return deleteOnOrganisation($call, await $request);
-  }
-
-  $async.Future<$0.DeleteOnOrganisationResponse> deleteOnOrganisation($grpc.ServiceCall call, $0.DeleteOnOrganisationRequest request);
-
-  $async.Future<$0.ComputeETAPeriodOnOrganisationResponse> computeETAPeriodOnOrganisation_Pre($grpc.ServiceCall $call, $async.Future<$0.ComputeETAPeriodOnOrganisationRequest> $request) async {
-    return computeETAPeriodOnOrganisation($call, await $request);
-  }
-
-  $async.Future<$0.ComputeETAPeriodOnOrganisationResponse> computeETAPeriodOnOrganisation($grpc.ServiceCall call, $0.ComputeETAPeriodOnOrganisationRequest request);
-
-  $async.Future<$0.CreateOnSiteResponse> createOnSite_Pre($grpc.ServiceCall $call, $async.Future<$0.CreateOnSiteRequest> $request) async {
-    return createOnSite($call, await $request);
-  }
-
-  $async.Future<$0.CreateOnSiteResponse> createOnSite($grpc.ServiceCall call, $0.CreateOnSiteRequest request);
-
-  $async.Future<$0.GetOnSiteResponse> getOnSite_Pre($grpc.ServiceCall $call, $async.Future<$0.GetOnSiteRequest> $request) async {
-    return getOnSite($call, await $request);
-  }
-
-  $async.Future<$0.GetOnSiteResponse> getOnSite($grpc.ServiceCall call, $0.GetOnSiteRequest request);
-
-  $async.Future<$0.ListOnSiteResponse> listOnSite_Pre($grpc.ServiceCall $call, $async.Future<$0.ListOnSiteRequest> $request) async {
-    return listOnSite($call, await $request);
-  }
-
-  $async.Future<$0.ListOnSiteResponse> listOnSite($grpc.ServiceCall call, $0.ListOnSiteRequest request);
-
-  $async.Future<$0.UpdateOnSiteResponse> updateOnSite_Pre($grpc.ServiceCall $call, $async.Future<$0.UpdateOnSiteRequest> $request) async {
-    return updateOnSite($call, await $request);
-  }
-
-  $async.Future<$0.UpdateOnSiteResponse> updateOnSite($grpc.ServiceCall call, $0.UpdateOnSiteRequest request);
-
-  $async.Future<$0.DeleteOnSiteResponse> deleteOnSite_Pre($grpc.ServiceCall $call, $async.Future<$0.DeleteOnSiteRequest> $request) async {
-    return deleteOnSite($call, await $request);
-  }
-
-  $async.Future<$0.DeleteOnSiteResponse> deleteOnSite($grpc.ServiceCall call, $0.DeleteOnSiteRequest request);
-
-  $async.Future<$0.GetPublicHolidaysResponse> getPublicHolidays_Pre($grpc.ServiceCall $call, $async.Future<$0.GetPublicHolidaysRequest> $request) async {
-    return getPublicHolidays($call, await $request);
-  }
-
-  $async.Future<$0.GetPublicHolidaysResponse> getPublicHolidays($grpc.ServiceCall call, $0.GetPublicHolidaysRequest request);
-
-  $async.Future<$0.ComputeETAPeriodOnSiteResponse> computeETAPeriodOnSite_Pre($grpc.ServiceCall $call, $async.Future<$0.ComputeETAPeriodOnSiteRequest> $request) async {
-    return computeETAPeriodOnSite($call, await $request);
-  }
-
-  $async.Future<$0.ComputeETAPeriodOnSiteResponse> computeETAPeriodOnSite($grpc.ServiceCall call, $0.ComputeETAPeriodOnSiteRequest request);
-
-}
--- a/lib/calendar.pbjson.dart
+++ b/lib/calendar.pbjson.dart
@@ -1,477 +0,0 @@
-// This is a generated file - do not edit.
-//
-// Generated from calendar.proto.
-
-// @dart = 3.3
-
-// ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
-
-import 'dart:convert' as $convert;
-import 'dart:core' as $core;
-import 'dart:typed_data' as $typed_data;
-
-@$core.Deprecated('Use workTimeDayDescriptor instead')
-const WorkTimeDay$json = {
-  '1': 'WorkTimeDay',
-  '2': [
-    {'1': 'WeekDay', '3': 1, '4': 1, '5': 14, '6': '.api.WeekDay', '10': 'WeekDay'},
-    {'1': 'IsWorkingDay', '3': 2, '4': 1, '5': 8, '10': 'IsWorkingDay'},
-    {'1': 'TimeRanges', '3': 3, '4': 3, '5': 11, '6': '.api.TimeRange', '10': 'TimeRanges'},
-  ],
-};
-
-/// Descriptor for `WorkTimeDay`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List workTimeDayDescriptor = $convert.base64Decode(
-    'CgtXb3JrVGltZURheRImCgdXZWVrRGF5GAEgASgOMgwuYXBpLldlZWtEYXlSB1dlZWtEYXkSIg'
-    'oMSXNXb3JraW5nRGF5GAIgASgIUgxJc1dvcmtpbmdEYXkSLgoKVGltZVJhbmdlcxgDIAMoCzIO'
-    'LmFwaS5UaW1lUmFuZ2VSClRpbWVSYW5nZXM=');
-
-@$core.Deprecated('Use exceptionalClosureDescriptor instead')
-const ExceptionalClosure$json = {
-  '1': 'ExceptionalClosure',
-  '2': [
-    {'1': 'Labels', '3': 1, '4': 3, '5': 11, '6': '.api.LabelByLanguage', '10': 'Labels'},
-    {'1': 'StartDate', '3': 2, '4': 1, '5': 9, '8': {}, '10': 'StartDate'},
-    {'1': 'EndDate', '3': 3, '4': 1, '5': 9, '8': {}, '10': 'EndDate'},
-    {'1': 'FullDay', '3': 4, '4': 1, '5': 8, '10': 'FullDay'},
-    {'1': 'StartHour', '3': 5, '4': 1, '5': 9, '8': {}, '10': 'StartHour'},
-    {'1': 'EndHour', '3': 6, '4': 1, '5': 9, '8': {}, '10': 'EndHour'},
-  ],
-};
-
-/// Descriptor for `ExceptionalClosure`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List exceptionalClosureDescriptor = $convert.base64Decode(
-    'ChJFeGNlcHRpb25hbENsb3N1cmUSLAoGTGFiZWxzGAEgAygLMhQuYXBpLkxhYmVsQnlMYW5ndW'
-    'FnZVIGTGFiZWxzEloKCVN0YXJ0RGF0ZRgCIAEoCUI8+kI5cjcyNV4yMFswLTldezJ9LSgwWzEt'
-    'OV18MVswLTJdKS0oMFsxLTldfFsxMl1bMC05XXwzWzAxXSkkUglTdGFydERhdGUSVgoHRW5kRG'
-    'F0ZRgDIAEoCUI8+kI5cjcyNV4yMFswLTldezJ9LSgwWzEtOV18MVswLTJdKS0oMFsxLTldfFsx'
-    'Ml1bMC05XXwzWzAxXSkkUgdFbmREYXRlEhgKB0Z1bGxEYXkYBCABKAhSB0Z1bGxEYXkSRgoJU3'
-    'RhcnRIb3VyGAUgASgJQij6QiVyIzIhXig/OlswMV1bMC05XXwyWzAtM10pOlswLTVdWzAtOV0k'
-    'UglTdGFydEhvdXISQgoHRW5kSG91chgGIAEoCUIo+kIlciMyIV4oPzpbMDFdWzAtOV18MlswLT'
-    'NdKTpbMC01XVswLTldJFIHRW5kSG91cg==');
-
-@$core.Deprecated('Use calendarDescriptor instead')
-const Calendar$json = {
-  '1': 'Calendar',
-  '2': [
-    {'1': 'ID', '3': 1, '4': 1, '5': 9, '8': {}, '10': 'ID'},
-    {'1': 'RscType', '3': 2, '4': 1, '5': 14, '6': '.api.ResourceType', '10': 'RscType'},
-    {'1': 'ResourceID', '3': 3, '4': 1, '5': 9, '10': 'ResourceID'},
-    {'1': 'Name', '3': 4, '4': 1, '5': 9, '8': {}, '10': 'Name'},
-    {'1': 'Description', '3': 5, '4': 1, '5': 9, '10': 'Description'},
-    {'1': 'ExceptionalClosures', '3': 6, '4': 3, '5': 11, '6': '.api.ExceptionalClosure', '10': 'ExceptionalClosures'},
-    {'1': 'WorkTimeDays', '3': 7, '4': 3, '5': 11, '6': '.api.WorkTimeDay', '8': {}, '10': 'WorkTimeDays'},
-  ],
-};
-
-/// Descriptor for `Calendar`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List calendarDescriptor = $convert.base64Decode(
-    'CghDYWxlbmRhchIXCgJJRBgBIAEoCUIH+kIEcgIQAVICSUQSKwoHUnNjVHlwZRgCIAEoDjIRLm'
-    'FwaS5SZXNvdXJjZVR5cGVSB1JzY1R5cGUSHgoKUmVzb3VyY2VJRBgDIAEoCVIKUmVzb3VyY2VJ'
-    'RBIbCgROYW1lGAQgASgJQgf6QgRyAhABUgROYW1lEiAKC0Rlc2NyaXB0aW9uGAUgASgJUgtEZX'
-    'NjcmlwdGlvbhJJChNFeGNlcHRpb25hbENsb3N1cmVzGAYgAygLMhcuYXBpLkV4Y2VwdGlvbmFs'
-    'Q2xvc3VyZVITRXhjZXB0aW9uYWxDbG9zdXJlcxJBCgxXb3JrVGltZURheXMYByADKAsyEC5hcG'
-    'kuV29ya1RpbWVEYXlCC+rBGAdXZWVrRGF5UgxXb3JrVGltZURheXM=');
-
-@$core.Deprecated('Use createOnOrganisationRequestDescriptor instead')
-const CreateOnOrganisationRequest$json = {
-  '1': 'CreateOnOrganisationRequest',
-  '2': [
-    {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.RequestOrganisationHeader', '8': {}, '10': 'Header'},
-    {'1': 'Name', '3': 2, '4': 1, '5': 9, '8': {}, '10': 'Name'},
-    {'1': 'Description', '3': 3, '4': 1, '5': 9, '10': 'Description'},
-    {'1': 'ExceptionalClosures', '3': 4, '4': 3, '5': 11, '6': '.api.ExceptionalClosure', '10': 'ExceptionalClosures'},
-    {'1': 'WorkTimeDays', '3': 7, '4': 3, '5': 11, '6': '.api.WorkTimeDay', '8': {}, '10': 'WorkTimeDays'},
-  ],
-  '7': {},
-};
-
-/// Descriptor for `CreateOnOrganisationRequest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List createOnOrganisationRequestDescriptor = $convert.base64Decode(
-    'ChtDcmVhdGVPbk9yZ2FuaXNhdGlvblJlcXVlc3QSQAoGSGVhZGVyGAEgASgLMh4uYXBpLlJlcX'
-    'Vlc3RPcmdhbmlzYXRpb25IZWFkZXJCCPpCBYoBAhABUgZIZWFkZXISGwoETmFtZRgCIAEoCUIH'
-    '+kIEcgIQAVIETmFtZRIgCgtEZXNjcmlwdGlvbhgDIAEoCVILRGVzY3JpcHRpb24SSQoTRXhjZX'
-    'B0aW9uYWxDbG9zdXJlcxgEIAMoCzIXLmFwaS5FeGNlcHRpb25hbENsb3N1cmVSE0V4Y2VwdGlv'
-    'bmFsQ2xvc3VyZXMSQQoMV29ya1RpbWVEYXlzGAcgAygLMhAuYXBpLldvcmtUaW1lRGF5QgvqwR'
-    'gHV2Vla0RheVIMV29ya1RpbWVEYXlzOhWSQRIKENIBBkhlYWRlctIBBE5hbWU=');
-
-@$core.Deprecated('Use createOnOrganisationResponseDescriptor instead')
-const CreateOnOrganisationResponse$json = {
-  '1': 'CreateOnOrganisationResponse',
-  '2': [
-    {'1': 'Calendar', '3': 1, '4': 1, '5': 11, '6': '.api.Calendar', '8': {}, '10': 'Calendar'},
-  ],
-};
-
-/// Descriptor for `CreateOnOrganisationResponse`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List createOnOrganisationResponseDescriptor = $convert.base64Decode(
-    'ChxDcmVhdGVPbk9yZ2FuaXNhdGlvblJlc3BvbnNlEjMKCENhbGVuZGFyGAEgASgLMg0uYXBpLk'
-    'NhbGVuZGFyQgj6QgWKAQIQAVIIQ2FsZW5kYXI=');
-
-@$core.Deprecated('Use getOnOrganisationRequestDescriptor instead')
-const GetOnOrganisationRequest$json = {
-  '1': 'GetOnOrganisationRequest',
-  '2': [
-    {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.RequestOrganisationHeader', '8': {}, '10': 'Header'},
-    {'1': 'ID', '3': 2, '4': 1, '5': 9, '8': {}, '10': 'ID'},
-  ],
-  '7': {},
-};
-
-/// Descriptor for `GetOnOrganisationRequest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List getOnOrganisationRequestDescriptor = $convert.base64Decode(
-    'ChhHZXRPbk9yZ2FuaXNhdGlvblJlcXVlc3QSQAoGSGVhZGVyGAEgASgLMh4uYXBpLlJlcXVlc3'
-    'RPcmdhbmlzYXRpb25IZWFkZXJCCPpCBYoBAhABUgZIZWFkZXISFwoCSUQYAiABKAlCB/pCBHIC'
-    'EAFSAklEOhOSQRAKDtIBBkhlYWRlctIBAklE');
-
-@$core.Deprecated('Use getOnOrganisationResponseDescriptor instead')
-const GetOnOrganisationResponse$json = {
-  '1': 'GetOnOrganisationResponse',
-  '2': [
-    {'1': 'Calendar', '3': 1, '4': 1, '5': 11, '6': '.api.Calendar', '8': {}, '10': 'Calendar'},
-  ],
-};
-
-/// Descriptor for `GetOnOrganisationResponse`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List getOnOrganisationResponseDescriptor = $convert.base64Decode(
-    'ChlHZXRPbk9yZ2FuaXNhdGlvblJlc3BvbnNlEjMKCENhbGVuZGFyGAEgASgLMg0uYXBpLkNhbG'
-    'VuZGFyQgj6QgWKAQIQAVIIQ2FsZW5kYXI=');
-
-@$core.Deprecated('Use listOnOrganisationRequestDescriptor instead')
-const ListOnOrganisationRequest$json = {
-  '1': 'ListOnOrganisationRequest',
-  '2': [
-    {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.RequestOrganisationHeader', '8': {}, '10': 'Header'},
-  ],
-  '7': {},
-};
-
-/// Descriptor for `ListOnOrganisationRequest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List listOnOrganisationRequestDescriptor = $convert.base64Decode(
-    'ChlMaXN0T25PcmdhbmlzYXRpb25SZXF1ZXN0EkAKBkhlYWRlchgBIAEoCzIeLmFwaS5SZXF1ZX'
-    'N0T3JnYW5pc2F0aW9uSGVhZGVyQgj6QgWKAQIQAVIGSGVhZGVyOg6SQQsKCdIBBkhlYWRlcg==');
-
-@$core.Deprecated('Use listOnOrganisationResponseDescriptor instead')
-const ListOnOrganisationResponse$json = {
-  '1': 'ListOnOrganisationResponse',
-  '2': [
-    {'1': 'Calendars', '3': 1, '4': 3, '5': 11, '6': '.api.Calendar', '10': 'Calendars'},
-  ],
-};
-
-/// Descriptor for `ListOnOrganisationResponse`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List listOnOrganisationResponseDescriptor = $convert.base64Decode(
-    'ChpMaXN0T25PcmdhbmlzYXRpb25SZXNwb25zZRIrCglDYWxlbmRhcnMYASADKAsyDS5hcGkuQ2'
-    'FsZW5kYXJSCUNhbGVuZGFycw==');
-
-@$core.Deprecated('Use updateOnOrganisationRequestDescriptor instead')
-const UpdateOnOrganisationRequest$json = {
-  '1': 'UpdateOnOrganisationRequest',
-  '2': [
-    {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.RequestOrganisationHeader', '8': {}, '10': 'Header'},
-    {'1': 'ID', '3': 2, '4': 1, '5': 9, '8': {}, '10': 'ID'},
-    {'1': 'Name', '3': 3, '4': 1, '5': 9, '10': 'Name'},
-    {'1': 'Description', '3': 4, '4': 1, '5': 9, '8': {}, '10': 'Description'},
-    {'1': 'ExceptionalClosures', '3': 5, '4': 3, '5': 11, '6': '.api.ExceptionalClosure', '10': 'ExceptionalClosures'},
-    {'1': 'WorkTimeDays', '3': 7, '4': 3, '5': 11, '6': '.api.WorkTimeDay', '8': {}, '10': 'WorkTimeDays'},
-  ],
-  '7': {},
-};
-
-/// Descriptor for `UpdateOnOrganisationRequest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List updateOnOrganisationRequestDescriptor = $convert.base64Decode(
-    'ChtVcGRhdGVPbk9yZ2FuaXNhdGlvblJlcXVlc3QSQAoGSGVhZGVyGAEgASgLMh4uYXBpLlJlcX'
-    'Vlc3RPcmdhbmlzYXRpb25IZWFkZXJCCPpCBYoBAhABUgZIZWFkZXISFwoCSUQYAiABKAlCB/pC'
-    'BHICEAFSAklEEhIKBE5hbWUYAyABKAlSBE5hbWUSKQoLRGVzY3JpcHRpb24YBCABKAlCB/pCBH'
-    'ICEAFSC0Rlc2NyaXB0aW9uEkkKE0V4Y2VwdGlvbmFsQ2xvc3VyZXMYBSADKAsyFy5hcGkuRXhj'
-    'ZXB0aW9uYWxDbG9zdXJlUhNFeGNlcHRpb25hbENsb3N1cmVzEkEKDFdvcmtUaW1lRGF5cxgHIA'
-    'MoCzIQLmFwaS5Xb3JrVGltZURheUIL6sEYB1dlZWtEYXlSDFdvcmtUaW1lRGF5czoTkkEQCg7S'
-    'AQZIZWFkZXLSAQJJRA==');
-
-@$core.Deprecated('Use updateOnOrganisationResponseDescriptor instead')
-const UpdateOnOrganisationResponse$json = {
-  '1': 'UpdateOnOrganisationResponse',
-  '2': [
-    {'1': 'Calendar', '3': 1, '4': 1, '5': 11, '6': '.api.Calendar', '8': {}, '10': 'Calendar'},
-  ],
-};
-
-/// Descriptor for `UpdateOnOrganisationResponse`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List updateOnOrganisationResponseDescriptor = $convert.base64Decode(
-    'ChxVcGRhdGVPbk9yZ2FuaXNhdGlvblJlc3BvbnNlEjMKCENhbGVuZGFyGAEgASgLMg0uYXBpLk'
-    'NhbGVuZGFyQgj6QgWKAQIQAVIIQ2FsZW5kYXI=');
-
-@$core.Deprecated('Use deleteOnOrganisationRequestDescriptor instead')
-const DeleteOnOrganisationRequest$json = {
-  '1': 'DeleteOnOrganisationRequest',
-  '2': [
-    {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.RequestOrganisationHeader', '8': {}, '10': 'Header'},
-    {'1': 'ID', '3': 2, '4': 1, '5': 9, '8': {}, '10': 'ID'},
-  ],
-  '7': {},
-};
-
-/// Descriptor for `DeleteOnOrganisationRequest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List deleteOnOrganisationRequestDescriptor = $convert.base64Decode(
-    'ChtEZWxldGVPbk9yZ2FuaXNhdGlvblJlcXVlc3QSQAoGSGVhZGVyGAEgASgLMh4uYXBpLlJlcX'
-    'Vlc3RPcmdhbmlzYXRpb25IZWFkZXJCCPpCBYoBAhABUgZIZWFkZXISFwoCSUQYAiABKAlCB/pC'
-    'BHICEAFSAklEOhOSQRAKDtIBBkhlYWRlctIBAklE');
-
-@$core.Deprecated('Use deleteOnOrganisationResponseDescriptor instead')
-const DeleteOnOrganisationResponse$json = {
-  '1': 'DeleteOnOrganisationResponse',
-};
-
-/// Descriptor for `DeleteOnOrganisationResponse`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List deleteOnOrganisationResponseDescriptor = $convert.base64Decode(
-    'ChxEZWxldGVPbk9yZ2FuaXNhdGlvblJlc3BvbnNl');
-
-@$core.Deprecated('Use getPublicHolidaysRequestDescriptor instead')
-const GetPublicHolidaysRequest$json = {
-  '1': 'GetPublicHolidaysRequest',
-  '2': [
-    {'1': 'CountryCode', '3': 1, '4': 1, '5': 9, '8': {}, '10': 'CountryCode'},
-    {'1': 'UpToYear', '3': 2, '4': 1, '5': 13, '8': {}, '10': 'UpToYear'},
-  ],
-};
-
-/// Descriptor for `GetPublicHolidaysRequest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List getPublicHolidaysRequestDescriptor = $convert.base64Decode(
-    'ChhHZXRQdWJsaWNIb2xpZGF5c1JlcXVlc3QSKgoLQ291bnRyeUNvZGUYASABKAlCCPpCBXIDiA'
-    'IBUgtDb3VudHJ5Q29kZRInCghVcFRvWWVhchgCIAEoDUIL+kIIKgYQmBEo6Q9SCFVwVG9ZZWFy');
-
-@$core.Deprecated('Use getPublicHolidaysResponseDescriptor instead')
-const GetPublicHolidaysResponse$json = {
-  '1': 'GetPublicHolidaysResponse',
-  '2': [
-    {'1': 'Holidays', '3': 1, '4': 3, '5': 11, '6': '.api.ExceptionalClosure', '10': 'Holidays'},
-  ],
-};
-
-/// Descriptor for `GetPublicHolidaysResponse`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List getPublicHolidaysResponseDescriptor = $convert.base64Decode(
-    'ChlHZXRQdWJsaWNIb2xpZGF5c1Jlc3BvbnNlEjMKCEhvbGlkYXlzGAEgAygLMhcuYXBpLkV4Y2'
-    'VwdGlvbmFsQ2xvc3VyZVIISG9saWRheXM=');
-
-@$core.Deprecated('Use computeETAPeriodOnOrganisationRequestDescriptor instead')
-const ComputeETAPeriodOnOrganisationRequest$json = {
-  '1': 'ComputeETAPeriodOnOrganisationRequest',
-  '2': [
-    {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.RequestOrganisationHeader', '8': {}, '10': 'Header'},
-    {'1': 'ID', '3': 2, '4': 1, '5': 9, '8': {}, '10': 'ID'},
-    {'1': 'Period', '3': 3, '4': 1, '5': 11, '6': '.api.Period', '10': 'Period'},
-    {'1': 'StartSearchTime', '3': 4, '4': 1, '5': 9, '10': 'StartSearchTime'},
-  ],
-  '7': {},
-};
-
-/// Descriptor for `ComputeETAPeriodOnOrganisationRequest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List computeETAPeriodOnOrganisationRequestDescriptor = $convert.base64Decode(
-    'CiVDb21wdXRlRVRBUGVyaW9kT25PcmdhbmlzYXRpb25SZXF1ZXN0EkAKBkhlYWRlchgBIAEoCz'
-    'IeLmFwaS5SZXF1ZXN0T3JnYW5pc2F0aW9uSGVhZGVyQgj6QgWKAQIQAVIGSGVhZGVyEhcKAklE'
-    'GAIgASgJQgf6QgRyAhABUgJJRBIjCgZQZXJpb2QYAyABKAsyCy5hcGkuUGVyaW9kUgZQZXJpb2'
-    'QSKAoPU3RhcnRTZWFyY2hUaW1lGAQgASgJUg9TdGFydFNlYXJjaFRpbWU6LpJBKwop0gEGSGVh'
-    'ZGVy0gECSUTSAQZQZXJpb2TSAQ9TdGFydFNlYXJjaFRpbWU=');
-
-@$core.Deprecated('Use computeETAPeriodOnOrganisationResponseDescriptor instead')
-const ComputeETAPeriodOnOrganisationResponse$json = {
-  '1': 'ComputeETAPeriodOnOrganisationResponse',
-  '2': [
-    {'1': 'StartEta', '3': 1, '4': 1, '5': 9, '10': 'StartEta'},
-  ],
-};
-
-/// Descriptor for `ComputeETAPeriodOnOrganisationResponse`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List computeETAPeriodOnOrganisationResponseDescriptor = $convert.base64Decode(
-    'CiZDb21wdXRlRVRBUGVyaW9kT25PcmdhbmlzYXRpb25SZXNwb25zZRIaCghTdGFydEV0YRgBIA'
-    'EoCVIIU3RhcnRFdGE=');
-
-@$core.Deprecated('Use createOnSiteRequestDescriptor instead')
-const CreateOnSiteRequest$json = {
-  '1': 'CreateOnSiteRequest',
-  '2': [
-    {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.RequestSiteHeader', '8': {}, '10': 'Header'},
-    {'1': 'Name', '3': 2, '4': 1, '5': 9, '8': {}, '10': 'Name'},
-    {'1': 'Description', '3': 3, '4': 1, '5': 9, '10': 'Description'},
-    {'1': 'ExceptionalClosures', '3': 4, '4': 3, '5': 11, '6': '.api.ExceptionalClosure', '10': 'ExceptionalClosures'},
-    {'1': 'WorkTimeDays', '3': 7, '4': 3, '5': 11, '6': '.api.WorkTimeDay', '8': {}, '10': 'WorkTimeDays'},
-  ],
-  '7': {},
-};
-
-/// Descriptor for `CreateOnSiteRequest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List createOnSiteRequestDescriptor = $convert.base64Decode(
-    'ChNDcmVhdGVPblNpdGVSZXF1ZXN0EjgKBkhlYWRlchgBIAEoCzIWLmFwaS5SZXF1ZXN0U2l0ZU'
-    'hlYWRlckII+kIFigECEAFSBkhlYWRlchIbCgROYW1lGAIgASgJQgf6QgRyAhABUgROYW1lEiAK'
-    'C0Rlc2NyaXB0aW9uGAMgASgJUgtEZXNjcmlwdGlvbhJJChNFeGNlcHRpb25hbENsb3N1cmVzGA'
-    'QgAygLMhcuYXBpLkV4Y2VwdGlvbmFsQ2xvc3VyZVITRXhjZXB0aW9uYWxDbG9zdXJlcxJBCgxX'
-    'b3JrVGltZURheXMYByADKAsyEC5hcGkuV29ya1RpbWVEYXlCC+rBGAdXZWVrRGF5UgxXb3JrVG'
-    'ltZURheXM6FZJBEgoQ0gEGSGVhZGVy0gEETmFtZQ==');
-
-@$core.Deprecated('Use createOnSiteResponseDescriptor instead')
-const CreateOnSiteResponse$json = {
-  '1': 'CreateOnSiteResponse',
-  '2': [
-    {'1': 'Calendar', '3': 1, '4': 1, '5': 11, '6': '.api.Calendar', '8': {}, '10': 'Calendar'},
-  ],
-};
-
-/// Descriptor for `CreateOnSiteResponse`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List createOnSiteResponseDescriptor = $convert.base64Decode(
-    'ChRDcmVhdGVPblNpdGVSZXNwb25zZRIzCghDYWxlbmRhchgBIAEoCzINLmFwaS5DYWxlbmRhck'
-    'II+kIFigECEAFSCENhbGVuZGFy');
-
-@$core.Deprecated('Use getOnSiteRequestDescriptor instead')
-const GetOnSiteRequest$json = {
-  '1': 'GetOnSiteRequest',
-  '2': [
-    {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.RequestSiteHeader', '8': {}, '10': 'Header'},
-    {'1': 'ID', '3': 2, '4': 1, '5': 9, '8': {}, '10': 'ID'},
-  ],
-  '7': {},
-};
-
-/// Descriptor for `GetOnSiteRequest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List getOnSiteRequestDescriptor = $convert.base64Decode(
-    'ChBHZXRPblNpdGVSZXF1ZXN0EjgKBkhlYWRlchgBIAEoCzIWLmFwaS5SZXF1ZXN0U2l0ZUhlYW'
-    'RlckII+kIFigECEAFSBkhlYWRlchIXCgJJRBgCIAEoCUIH+kIEcgIQAVICSUQ6E5JBEAoO0gEG'
-    'SGVhZGVy0gECSUQ=');
-
-@$core.Deprecated('Use getOnSiteResponseDescriptor instead')
-const GetOnSiteResponse$json = {
-  '1': 'GetOnSiteResponse',
-  '2': [
-    {'1': 'Calendar', '3': 1, '4': 1, '5': 11, '6': '.api.Calendar', '8': {}, '10': 'Calendar'},
-  ],
-};
-
-/// Descriptor for `GetOnSiteResponse`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List getOnSiteResponseDescriptor = $convert.base64Decode(
-    'ChFHZXRPblNpdGVSZXNwb25zZRIzCghDYWxlbmRhchgBIAEoCzINLmFwaS5DYWxlbmRhckII+k'
-    'IFigECEAFSCENhbGVuZGFy');
-
-@$core.Deprecated('Use listOnSiteRequestDescriptor instead')
-const ListOnSiteRequest$json = {
-  '1': 'ListOnSiteRequest',
-  '2': [
-    {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.RequestSiteHeader', '8': {}, '10': 'Header'},
-  ],
-  '7': {},
-};
-
-/// Descriptor for `ListOnSiteRequest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List listOnSiteRequestDescriptor = $convert.base64Decode(
-    'ChFMaXN0T25TaXRlUmVxdWVzdBI4CgZIZWFkZXIYASABKAsyFi5hcGkuUmVxdWVzdFNpdGVIZW'
-    'FkZXJCCPpCBYoBAhABUgZIZWFkZXI6DpJBCwoJ0gEGSGVhZGVy');
-
-@$core.Deprecated('Use listOnSiteResponseDescriptor instead')
-const ListOnSiteResponse$json = {
-  '1': 'ListOnSiteResponse',
-  '2': [
-    {'1': 'Calendars', '3': 1, '4': 3, '5': 11, '6': '.api.Calendar', '10': 'Calendars'},
-  ],
-};
-
-/// Descriptor for `ListOnSiteResponse`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List listOnSiteResponseDescriptor = $convert.base64Decode(
-    'ChJMaXN0T25TaXRlUmVzcG9uc2USKwoJQ2FsZW5kYXJzGAEgAygLMg0uYXBpLkNhbGVuZGFyUg'
-    'lDYWxlbmRhcnM=');
-
-@$core.Deprecated('Use updateOnSiteRequestDescriptor instead')
-const UpdateOnSiteRequest$json = {
-  '1': 'UpdateOnSiteRequest',
-  '2': [
-    {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.RequestSiteHeader', '8': {}, '10': 'Header'},
-    {'1': 'ID', '3': 2, '4': 1, '5': 9, '8': {}, '10': 'ID'},
-    {'1': 'Name', '3': 3, '4': 1, '5': 9, '10': 'Name'},
-    {'1': 'Description', '3': 4, '4': 1, '5': 9, '8': {}, '10': 'Description'},
-    {'1': 'ExceptionalClosures', '3': 5, '4': 3, '5': 11, '6': '.api.ExceptionalClosure', '10': 'ExceptionalClosures'},
-    {'1': 'WorkTimeDays', '3': 7, '4': 3, '5': 11, '6': '.api.WorkTimeDay', '8': {}, '10': 'WorkTimeDays'},
-  ],
-  '7': {},
-};
-
-/// Descriptor for `UpdateOnSiteRequest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List updateOnSiteRequestDescriptor = $convert.base64Decode(
-    'ChNVcGRhdGVPblNpdGVSZXF1ZXN0EjgKBkhlYWRlchgBIAEoCzIWLmFwaS5SZXF1ZXN0U2l0ZU'
-    'hlYWRlckII+kIFigECEAFSBkhlYWRlchIXCgJJRBgCIAEoCUIH+kIEcgIQAVICSUQSEgoETmFt'
-    'ZRgDIAEoCVIETmFtZRIpCgtEZXNjcmlwdGlvbhgEIAEoCUIH+kIEcgIQAVILRGVzY3JpcHRpb2'
-    '4SSQoTRXhjZXB0aW9uYWxDbG9zdXJlcxgFIAMoCzIXLmFwaS5FeGNlcHRpb25hbENsb3N1cmVS'
-    'E0V4Y2VwdGlvbmFsQ2xvc3VyZXMSQQoMV29ya1RpbWVEYXlzGAcgAygLMhAuYXBpLldvcmtUaW'
-    '1lRGF5QgvqwRgHV2Vla0RheVIMV29ya1RpbWVEYXlzOhOSQRAKDtIBBkhlYWRlctIBAklE');
-
-@$core.Deprecated('Use updateOnSiteResponseDescriptor instead')
-const UpdateOnSiteResponse$json = {
-  '1': 'UpdateOnSiteResponse',
-  '2': [
-    {'1': 'Calendar', '3': 1, '4': 1, '5': 11, '6': '.api.Calendar', '8': {}, '10': 'Calendar'},
-  ],
-};
-
-/// Descriptor for `UpdateOnSiteResponse`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List updateOnSiteResponseDescriptor = $convert.base64Decode(
-    'ChRVcGRhdGVPblNpdGVSZXNwb25zZRIzCghDYWxlbmRhchgBIAEoCzINLmFwaS5DYWxlbmRhck'
-    'II+kIFigECEAFSCENhbGVuZGFy');
-
-@$core.Deprecated('Use deleteOnSiteRequestDescriptor instead')
-const DeleteOnSiteRequest$json = {
-  '1': 'DeleteOnSiteRequest',
-  '2': [
-    {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.RequestSiteHeader', '8': {}, '10': 'Header'},
-    {'1': 'ID', '3': 2, '4': 1, '5': 9, '8': {}, '10': 'ID'},
-  ],
-  '7': {},
-};
-
-/// Descriptor for `DeleteOnSiteRequest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List deleteOnSiteRequestDescriptor = $convert.base64Decode(
-    'ChNEZWxldGVPblNpdGVSZXF1ZXN0EjgKBkhlYWRlchgBIAEoCzIWLmFwaS5SZXF1ZXN0U2l0ZU'
-    'hlYWRlckII+kIFigECEAFSBkhlYWRlchIXCgJJRBgCIAEoCUIH+kIEcgIQAVICSUQ6E5JBEAoO'
-    '0gEGSGVhZGVy0gECSUQ=');
-
-@$core.Deprecated('Use deleteOnSiteResponseDescriptor instead')
-const DeleteOnSiteResponse$json = {
-  '1': 'DeleteOnSiteResponse',
-};
-
-/// Descriptor for `DeleteOnSiteResponse`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List deleteOnSiteResponseDescriptor = $convert.base64Decode(
-    'ChREZWxldGVPblNpdGVSZXNwb25zZQ==');
-
-@$core.Deprecated('Use computeETAPeriodOnSiteRequestDescriptor instead')
-const ComputeETAPeriodOnSiteRequest$json = {
-  '1': 'ComputeETAPeriodOnSiteRequest',
-  '2': [
-    {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.RequestSiteHeader', '8': {}, '10': 'Header'},
-    {'1': 'ID', '3': 2, '4': 1, '5': 9, '8': {}, '10': 'ID'},
-    {'1': 'Period', '3': 3, '4': 1, '5': 11, '6': '.api.Period', '10': 'Period'},
-    {'1': 'StartSearchTime', '3': 4, '4': 1, '5': 9, '10': 'StartSearchTime'},
-  ],
-  '7': {},
-};
-
-/// Descriptor for `ComputeETAPeriodOnSiteRequest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List computeETAPeriodOnSiteRequestDescriptor = $convert.base64Decode(
-    'Ch1Db21wdXRlRVRBUGVyaW9kT25TaXRlUmVxdWVzdBI4CgZIZWFkZXIYASABKAsyFi5hcGkuUm'
-    'VxdWVzdFNpdGVIZWFkZXJCCPpCBYoBAhABUgZIZWFkZXISFwoCSUQYAiABKAlCB/pCBHICEAFS'
-    'AklEEiMKBlBlcmlvZBgDIAEoCzILLmFwaS5QZXJpb2RSBlBlcmlvZBIoCg9TdGFydFNlYXJjaF'
-    'RpbWUYBCABKAlSD1N0YXJ0U2VhcmNoVGltZToukkErCinSAQZIZWFkZXLSAQJJRNIBBlBlcmlv'
-    'ZNIBD1N0YXJ0U2VhcmNoVGltZQ==');
-
-@$core.Deprecated('Use computeETAPeriodOnSiteResponseDescriptor instead')
-const ComputeETAPeriodOnSiteResponse$json = {
-  '1': 'ComputeETAPeriodOnSiteResponse',
-  '2': [
-    {'1': 'StartEta', '3': 1, '4': 1, '5': 9, '10': 'StartEta'},
-  ],
-};
-
-/// Descriptor for `ComputeETAPeriodOnSiteResponse`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List computeETAPeriodOnSiteResponseDescriptor = $convert.base64Decode(
-    'Ch5Db21wdXRlRVRBUGVyaW9kT25TaXRlUmVzcG9uc2USGgoIU3RhcnRFdGEYASABKAlSCFN0YX'
-    'J0RXRh');
-
--- a/lib/claim-type.pb.dart
+++ b/lib/claim-type.pb.dart
--- a/lib/claim-type.pbenum.dart
+++ b/lib/claim-type.pbenum.dart
@@ -1,12 +1,11 @@
-// This is a generated file - do not edit.
 //
-// Generated from claim-type.proto.
-
+//  Generated code. Do not modify.
+//  source: claim-type.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

--- a/lib/claim-type.pbgrpc.dart
+++ b/lib/claim-type.pbgrpc.dart
@@ -1,14 +1,13 @@
-// This is a generated file - do not edit.
 //
-// Generated from claim-type.proto.
-
+//  Generated code. Do not modify.
+//  source: claim-type.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:async' as $async;
 import 'dart:core' as $core;
@@ -16,72 +15,62 @@ import 'dart:core' as $core;
 import 'package:grpc/service_api.dart' as $grpc;
 import 'package:protobuf/protobuf.dart' as $pb;

-import 'claim-type.pb.dart' as $0;
+import 'claim-type.pb.dart' as $10;

 export 'claim-type.pb.dart';

@$pb.GrpcServiceName('api.ClaimTypeService')
 class ClaimTypeServiceClient extends $grpc.Client {
-  /// The hostname for this service.
-  static const $core.String defaultHost = '';
-
-  /// OAuth scopes needed for the client.
-  static const $core.List<$core.String> oauthScopes = [
-    '',
-  ];
+  static final _$create = $grpc.ClientMethod<$10.CreateClaimTypeRequest, $10.CreateClaimTypeResponse>(
+      '/api.ClaimTypeService/Create',
+      ($10.CreateClaimTypeRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $10.CreateClaimTypeResponse.fromBuffer(value));
+  static final _$get = $grpc.ClientMethod<$10.GetClaimTypeRequest, $10.GetClaimTypeResponse>(
+      '/api.ClaimTypeService/Get',
+      ($10.GetClaimTypeRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $10.GetClaimTypeResponse.fromBuffer(value));
+  static final _$list = $grpc.ClientMethod<$10.ListClaimTypeRequest, $10.ListClaimTypeResponse>(
+      '/api.ClaimTypeService/List',
+      ($10.ListClaimTypeRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $10.ListClaimTypeResponse.fromBuffer(value));
+  static final _$update = $grpc.ClientMethod<$10.UpdateClaimTypeRequest, $10.UpdateClaimTypeResponse>(
+      '/api.ClaimTypeService/Update',
+      ($10.UpdateClaimTypeRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $10.UpdateClaimTypeResponse.fromBuffer(value));
+  static final _$delete = $grpc.ClientMethod<$10.DeleteClaimTypeRequest, $10.DeleteClaimTypeResponse>(
+      '/api.ClaimTypeService/Delete',
+      ($10.DeleteClaimTypeRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $10.DeleteClaimTypeResponse.fromBuffer(value));
+  static final _$deleteClaimTypesForProject = $grpc.ClientMethod<$10.DeleteClaimTypesForProjectRequest, $10.DeleteClaimTypesForProjectResponse>(
+      '/api.ClaimTypeService/DeleteClaimTypesForProject',
+      ($10.DeleteClaimTypesForProjectRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $10.DeleteClaimTypesForProjectResponse.fromBuffer(value));

  ClaimTypeServiceClient(super.channel, {super.options, super.interceptors});

-  $grpc.ResponseFuture<$0.CreateClaimTypeResponse> create($0.CreateClaimTypeRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$10.CreateClaimTypeResponse> create($10.CreateClaimTypeRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$create, request, options: options);
  }

-  $grpc.ResponseFuture<$0.GetClaimTypeResponse> get($0.GetClaimTypeRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$10.GetClaimTypeResponse> get($10.GetClaimTypeRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$get, request, options: options);
  }

-  $grpc.ResponseFuture<$0.ListClaimTypeResponse> list($0.ListClaimTypeRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$10.ListClaimTypeResponse> list($10.ListClaimTypeRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$list, request, options: options);
  }

-  $grpc.ResponseFuture<$0.UpdateClaimTypeResponse> update($0.UpdateClaimTypeRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$10.UpdateClaimTypeResponse> update($10.UpdateClaimTypeRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$update, request, options: options);
  }

-  $grpc.ResponseFuture<$0.DeleteClaimTypeResponse> delete($0.DeleteClaimTypeRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$10.DeleteClaimTypeResponse> delete($10.DeleteClaimTypeRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$delete, request, options: options);
  }

-  $grpc.ResponseFuture<$0.DeleteClaimTypesForProjectResponse> deleteClaimTypesForProject($0.DeleteClaimTypesForProjectRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$10.DeleteClaimTypesForProjectResponse> deleteClaimTypesForProject($10.DeleteClaimTypesForProjectRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$deleteClaimTypesForProject, request, options: options);
  }
-
-    // method descriptors
-
-  static final _$create = $grpc.ClientMethod<$0.CreateClaimTypeRequest, $0.CreateClaimTypeResponse>(
-      '/api.ClaimTypeService/Create',
-      ($0.CreateClaimTypeRequest value) => value.writeToBuffer(),
-      $0.CreateClaimTypeResponse.fromBuffer);
-  static final _$get = $grpc.ClientMethod<$0.GetClaimTypeRequest, $0.GetClaimTypeResponse>(
-      '/api.ClaimTypeService/Get',
-      ($0.GetClaimTypeRequest value) => value.writeToBuffer(),
-      $0.GetClaimTypeResponse.fromBuffer);
-  static final _$list = $grpc.ClientMethod<$0.ListClaimTypeRequest, $0.ListClaimTypeResponse>(
-      '/api.ClaimTypeService/List',
-      ($0.ListClaimTypeRequest value) => value.writeToBuffer(),
-      $0.ListClaimTypeResponse.fromBuffer);
-  static final _$update = $grpc.ClientMethod<$0.UpdateClaimTypeRequest, $0.UpdateClaimTypeResponse>(
-      '/api.ClaimTypeService/Update',
-      ($0.UpdateClaimTypeRequest value) => value.writeToBuffer(),
-      $0.UpdateClaimTypeResponse.fromBuffer);
-  static final _$delete = $grpc.ClientMethod<$0.DeleteClaimTypeRequest, $0.DeleteClaimTypeResponse>(
-      '/api.ClaimTypeService/Delete',
-      ($0.DeleteClaimTypeRequest value) => value.writeToBuffer(),
-      $0.DeleteClaimTypeResponse.fromBuffer);
-  static final _$deleteClaimTypesForProject = $grpc.ClientMethod<$0.DeleteClaimTypesForProjectRequest, $0.DeleteClaimTypesForProjectResponse>(
-      '/api.ClaimTypeService/DeleteClaimTypesForProject',
-      ($0.DeleteClaimTypesForProjectRequest value) => value.writeToBuffer(),
-      $0.DeleteClaimTypesForProjectResponse.fromBuffer);
 }

@$pb.GrpcServiceName('api.ClaimTypeService')
@@ -89,84 +78,78 @@ abstract class ClaimTypeServiceBase extends $grpc.Service {
  $core.String get $name => 'api.ClaimTypeService';

  ClaimTypeServiceBase() {
-    $addMethod($grpc.ServiceMethod<$0.CreateClaimTypeRequest, $0.CreateClaimTypeResponse>(
+    $addMethod($grpc.ServiceMethod<$10.CreateClaimTypeRequest, $10.CreateClaimTypeResponse>(
        'Create',
        create_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.CreateClaimTypeRequest.fromBuffer(value),
-        ($0.CreateClaimTypeResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.GetClaimTypeRequest, $0.GetClaimTypeResponse>(
+        ($core.List<$core.int> value) => $10.CreateClaimTypeRequest.fromBuffer(value),
+        ($10.CreateClaimTypeResponse value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$10.GetClaimTypeRequest, $10.GetClaimTypeResponse>(
        'Get',
        get_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.GetClaimTypeRequest.fromBuffer(value),
-        ($0.GetClaimTypeResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.ListClaimTypeRequest, $0.ListClaimTypeResponse>(
+        ($core.List<$core.int> value) => $10.GetClaimTypeRequest.fromBuffer(value),
+        ($10.GetClaimTypeResponse value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$10.ListClaimTypeRequest, $10.ListClaimTypeResponse>(
        'List',
        list_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.ListClaimTypeRequest.fromBuffer(value),
-        ($0.ListClaimTypeResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.UpdateClaimTypeRequest, $0.UpdateClaimTypeResponse>(
+        ($core.List<$core.int> value) => $10.ListClaimTypeRequest.fromBuffer(value),
+        ($10.ListClaimTypeResponse value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$10.UpdateClaimTypeRequest, $10.UpdateClaimTypeResponse>(
        'Update',
        update_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.UpdateClaimTypeRequest.fromBuffer(value),
-        ($0.UpdateClaimTypeResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.DeleteClaimTypeRequest, $0.DeleteClaimTypeResponse>(
+        ($core.List<$core.int> value) => $10.UpdateClaimTypeRequest.fromBuffer(value),
+        ($10.UpdateClaimTypeResponse value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$10.DeleteClaimTypeRequest, $10.DeleteClaimTypeResponse>(
        'Delete',
        delete_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.DeleteClaimTypeRequest.fromBuffer(value),
-        ($0.DeleteClaimTypeResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.DeleteClaimTypesForProjectRequest, $0.DeleteClaimTypesForProjectResponse>(
+        ($core.List<$core.int> value) => $10.DeleteClaimTypeRequest.fromBuffer(value),
+        ($10.DeleteClaimTypeResponse value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$10.DeleteClaimTypesForProjectRequest, $10.DeleteClaimTypesForProjectResponse>(
        'DeleteClaimTypesForProject',
        deleteClaimTypesForProject_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.DeleteClaimTypesForProjectRequest.fromBuffer(value),
-        ($0.DeleteClaimTypesForProjectResponse value) => value.writeToBuffer()));
+        ($core.List<$core.int> value) => $10.DeleteClaimTypesForProjectRequest.fromBuffer(value),
+        ($10.DeleteClaimTypesForProjectResponse value) => value.writeToBuffer()));
  }

-  $async.Future<$0.CreateClaimTypeResponse> create_Pre($grpc.ServiceCall $call, $async.Future<$0.CreateClaimTypeRequest> $request) async {
+  $async.Future<$10.CreateClaimTypeResponse> create_Pre($grpc.ServiceCall $call, $async.Future<$10.CreateClaimTypeRequest> $request) async {
    return create($call, await $request);
  }

-  $async.Future<$0.CreateClaimTypeResponse> create($grpc.ServiceCall call, $0.CreateClaimTypeRequest request);
-
-  $async.Future<$0.GetClaimTypeResponse> get_Pre($grpc.ServiceCall $call, $async.Future<$0.GetClaimTypeRequest> $request) async {
+  $async.Future<$10.GetClaimTypeResponse> get_Pre($grpc.ServiceCall $call, $async.Future<$10.GetClaimTypeRequest> $request) async {
    return get($call, await $request);
  }

-  $async.Future<$0.GetClaimTypeResponse> get($grpc.ServiceCall call, $0.GetClaimTypeRequest request);
-
-  $async.Future<$0.ListClaimTypeResponse> list_Pre($grpc.ServiceCall $call, $async.Future<$0.ListClaimTypeRequest> $request) async {
+  $async.Future<$10.ListClaimTypeResponse> list_Pre($grpc.ServiceCall $call, $async.Future<$10.ListClaimTypeRequest> $request) async {
    return list($call, await $request);
  }

-  $async.Future<$0.ListClaimTypeResponse> list($grpc.ServiceCall call, $0.ListClaimTypeRequest request);
-
-  $async.Future<$0.UpdateClaimTypeResponse> update_Pre($grpc.ServiceCall $call, $async.Future<$0.UpdateClaimTypeRequest> $request) async {
+  $async.Future<$10.UpdateClaimTypeResponse> update_Pre($grpc.ServiceCall $call, $async.Future<$10.UpdateClaimTypeRequest> $request) async {
    return update($call, await $request);
  }

-  $async.Future<$0.UpdateClaimTypeResponse> update($grpc.ServiceCall call, $0.UpdateClaimTypeRequest request);
-
-  $async.Future<$0.DeleteClaimTypeResponse> delete_Pre($grpc.ServiceCall $call, $async.Future<$0.DeleteClaimTypeRequest> $request) async {
+  $async.Future<$10.DeleteClaimTypeResponse> delete_Pre($grpc.ServiceCall $call, $async.Future<$10.DeleteClaimTypeRequest> $request) async {
    return delete($call, await $request);
  }

-  $async.Future<$0.DeleteClaimTypeResponse> delete($grpc.ServiceCall call, $0.DeleteClaimTypeRequest request);
-
-  $async.Future<$0.DeleteClaimTypesForProjectResponse> deleteClaimTypesForProject_Pre($grpc.ServiceCall $call, $async.Future<$0.DeleteClaimTypesForProjectRequest> $request) async {
+  $async.Future<$10.DeleteClaimTypesForProjectResponse> deleteClaimTypesForProject_Pre($grpc.ServiceCall $call, $async.Future<$10.DeleteClaimTypesForProjectRequest> $request) async {
    return deleteClaimTypesForProject($call, await $request);
  }

-  $async.Future<$0.DeleteClaimTypesForProjectResponse> deleteClaimTypesForProject($grpc.ServiceCall call, $0.DeleteClaimTypesForProjectRequest request);
-
+  $async.Future<$10.CreateClaimTypeResponse> create($grpc.ServiceCall call, $10.CreateClaimTypeRequest request);
+  $async.Future<$10.GetClaimTypeResponse> get($grpc.ServiceCall call, $10.GetClaimTypeRequest request);
+  $async.Future<$10.ListClaimTypeResponse> list($grpc.ServiceCall call, $10.ListClaimTypeRequest request);
+  $async.Future<$10.UpdateClaimTypeResponse> update($grpc.ServiceCall call, $10.UpdateClaimTypeRequest request);
+  $async.Future<$10.DeleteClaimTypeResponse> delete($grpc.ServiceCall call, $10.DeleteClaimTypeRequest request);
+  $async.Future<$10.DeleteClaimTypesForProjectResponse> deleteClaimTypesForProject($grpc.ServiceCall call, $10.DeleteClaimTypesForProjectRequest request);
 }
--- a/lib/claim-type.pbjson.dart
+++ b/lib/claim-type.pbjson.dart
@@ -1,14 +1,13 @@
-// This is a generated file - do not edit.
 //
-// Generated from claim-type.proto.
-
+//  Generated code. Do not modify.
+//  source: claim-type.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
--- a/lib/claim.pb.dart
+++ b/lib/claim.pb.dart
@@ -1,21 +1,21 @@
-// This is a generated file - do not edit.
 //
-// Generated from claim.proto.
-
+//  Generated code. Do not modify.
+//  source: claim.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:core' as $core;

 import 'package:protobuf/protobuf.dart' as $pb;

-import 'collabShared.pb.dart' as $1;
-import 'shared.pb.dart' as $0;
+import 'collabShared.pb.dart' as $70;
+import 'shared.pb.dart' as $3;
+import 'shared.pbenum.dart' as $3;

 export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;

@@ -23,40 +23,48 @@ export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
 /// Aggregation object message
 class Claim extends $pb.GeneratedMessage {
  factory Claim({
-    $0.EventHeader? lastEventHeader,
-    $0.EntityID? iD,
+    $3.EventHeader? lastEventHeader,
+    $3.EntityID? iD,
    ClaimPayload? payload,
  }) {
-    final result = create();
-    if (lastEventHeader != null) result.lastEventHeader = lastEventHeader;
-    if (iD != null) result.iD = iD;
-    if (payload != null) result.payload = payload;
-    return result;
+    final $result = create();
+    if (lastEventHeader != null) {
+      $result.lastEventHeader = lastEventHeader;
+    }
+    if (iD != null) {
+      $result.iD = iD;
+    }
+    if (payload != null) {
+      $result.payload = payload;
+    }
+    return $result;
  }
-
-  Claim._();
-
-  factory Claim.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory Claim.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  Claim._() : super();
+  factory Claim.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory Claim.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Claim', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$0.EventHeader>(1, _omitFieldNames ? '' : 'LastEventHeader', protoName: 'LastEventHeader', subBuilder: $0.EventHeader.create)
-    ..aOM<$0.EntityID>(2, _omitFieldNames ? '' : 'ID', protoName: 'ID', subBuilder: $0.EntityID.create)
+    ..aOM<$3.EventHeader>(1, _omitFieldNames ? '' : 'LastEventHeader', protoName: 'LastEventHeader', subBuilder: $3.EventHeader.create)
+    ..aOM<$3.EntityID>(2, _omitFieldNames ? '' : 'ID', protoName: 'ID', subBuilder: $3.EntityID.create)
    ..aOM<ClaimPayload>(3, _omitFieldNames ? '' : 'Payload', protoName: 'Payload', subBuilder: ClaimPayload.create)
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  Claim clone() => Claim()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  Claim copyWith(void Function(Claim) updates) => super.copyWith((message) => updates(message as Claim)) as Claim;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static Claim create() => Claim._();
-  @$core.override
  Claim createEmptyInstance() => create();
  static $pb.PbList<Claim> createRepeated() => $pb.PbList<Claim>();
  @$core.pragma('dart2js:noInline')
@@ -64,31 +72,31 @@ class Claim extends $pb.GeneratedMessage {
  static Claim? _defaultInstance;

  @$pb.TagNumber(1)
-  $0.EventHeader get lastEventHeader => $_getN(0);
+  $3.EventHeader get lastEventHeader => $_getN(0);
  @$pb.TagNumber(1)
-  set lastEventHeader($0.EventHeader value) => $_setField(1, value);
+  set lastEventHeader($3.EventHeader v) { $_setField(1, v); }
  @$pb.TagNumber(1)
  $core.bool hasLastEventHeader() => $_has(0);
  @$pb.TagNumber(1)
  void clearLastEventHeader() => $_clearField(1);
  @$pb.TagNumber(1)
-  $0.EventHeader ensureLastEventHeader() => $_ensure(0);
+  $3.EventHeader ensureLastEventHeader() => $_ensure(0);

  @$pb.TagNumber(2)
-  $0.EntityID get iD => $_getN(1);
+  $3.EntityID get iD => $_getN(1);
  @$pb.TagNumber(2)
-  set iD($0.EntityID value) => $_setField(2, value);
+  set iD($3.EntityID v) { $_setField(2, v); }
  @$pb.TagNumber(2)
  $core.bool hasID() => $_has(1);
  @$pb.TagNumber(2)
  void clearID() => $_clearField(2);
  @$pb.TagNumber(2)
-  $0.EntityID ensureID() => $_ensure(1);
+  $3.EntityID ensureID() => $_ensure(1);

  @$pb.TagNumber(3)
  ClaimPayload get payload => $_getN(2);
  @$pb.TagNumber(3)
-  set payload(ClaimPayload value) => $_setField(3, value);
+  set payload(ClaimPayload v) { $_setField(3, v); }
  @$pb.TagNumber(3)
  $core.bool hasPayload() => $_has(2);
  @$pb.TagNumber(3)
@@ -101,92 +109,131 @@ class ClaimPayload extends $pb.GeneratedMessage {
  factory ClaimPayload({
    $core.String? claimTypeID,
    $core.String? entityID,
-    $0.ClaimCriticality? criticality,
-    $1.ClaimStatusStruct? status,
+    $3.ClaimCriticality? criticality,
+    $70.ClaimStatusStruct? status,
    $core.String? creationDate,
    $core.Iterable<$core.String>? assignees,
    $core.String? endComment,
-    $0.ClaimClosure? closure,
-    $core.Iterable<$0.AttachmentSummary>? attachments,
+    $3.ClaimClosure? closure,
+    $core.Iterable<$3.AttachmentSummary>? attachments,
    $core.int? attachmentNumber,
-    $0.Amount? amount,
+    $3.Amount? amount,
    $core.String? reason,
-    $0.ClaimSector? sector,
-    $0.ClaimEntityType? entityType,
+    $3.ClaimSector? sector,
+    $3.ClaimEntityType? entityType,
    $core.Iterable<$core.String>? removedAssignees,
    $core.Iterable<$core.String>? addedAssignees,
    $core.String? reasonCode,
-    $core.Iterable<$0.MetadataElement>? metaData,
+    $core.Iterable<$3.MetadataElement>? metaData,
    $core.String? title,
    $core.String? displayID,
-    $core.String? message,
  }) {
-    final result = create();
-    if (claimTypeID != null) result.claimTypeID = claimTypeID;
-    if (entityID != null) result.entityID = entityID;
-    if (criticality != null) result.criticality = criticality;
-    if (status != null) result.status = status;
-    if (creationDate != null) result.creationDate = creationDate;
-    if (assignees != null) result.assignees.addAll(assignees);
-    if (endComment != null) result.endComment = endComment;
-    if (closure != null) result.closure = closure;
-    if (attachments != null) result.attachments.addAll(attachments);
-    if (attachmentNumber != null) result.attachmentNumber = attachmentNumber;
-    if (amount != null) result.amount = amount;
-    if (reason != null) result.reason = reason;
-    if (sector != null) result.sector = sector;
-    if (entityType != null) result.entityType = entityType;
-    if (removedAssignees != null) result.removedAssignees.addAll(removedAssignees);
-    if (addedAssignees != null) result.addedAssignees.addAll(addedAssignees);
-    if (reasonCode != null) result.reasonCode = reasonCode;
-    if (metaData != null) result.metaData.addAll(metaData);
-    if (title != null) result.title = title;
-    if (displayID != null) result.displayID = displayID;
-    if (message != null) result.message = message;
-    return result;
+    final $result = create();
+    if (claimTypeID != null) {
+      $result.claimTypeID = claimTypeID;
+    }
+    if (entityID != null) {
+      $result.entityID = entityID;
+    }
+    if (criticality != null) {
+      $result.criticality = criticality;
+    }
+    if (status != null) {
+      $result.status = status;
+    }
+    if (creationDate != null) {
+      $result.creationDate = creationDate;
+    }
+    if (assignees != null) {
+      $result.assignees.addAll(assignees);
+    }
+    if (endComment != null) {
+      $result.endComment = endComment;
+    }
+    if (closure != null) {
+      $result.closure = closure;
+    }
+    if (attachments != null) {
+      $result.attachments.addAll(attachments);
+    }
+    if (attachmentNumber != null) {
+      $result.attachmentNumber = attachmentNumber;
+    }
+    if (amount != null) {
+      $result.amount = amount;
+    }
+    if (reason != null) {
+      $result.reason = reason;
+    }
+    if (sector != null) {
+      $result.sector = sector;
+    }
+    if (entityType != null) {
+      $result.entityType = entityType;
+    }
+    if (removedAssignees != null) {
+      $result.removedAssignees.addAll(removedAssignees);
+    }
+    if (addedAssignees != null) {
+      $result.addedAssignees.addAll(addedAssignees);
+    }
+    if (reasonCode != null) {
+      $result.reasonCode = reasonCode;
+    }
+    if (metaData != null) {
+      $result.metaData.addAll(metaData);
+    }
+    if (title != null) {
+      $result.title = title;
+    }
+    if (displayID != null) {
+      $result.displayID = displayID;
+    }
+    return $result;
  }
-
-  ClaimPayload._();
-
-  factory ClaimPayload.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory ClaimPayload.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  ClaimPayload._() : super();
+  factory ClaimPayload.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory ClaimPayload.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ClaimPayload', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
    ..aOS(1, _omitFieldNames ? '' : 'ClaimTypeID', protoName: 'ClaimTypeID')
    ..aOS(2, _omitFieldNames ? '' : 'EntityID', protoName: 'EntityID')
-    ..e<$0.ClaimCriticality>(3, _omitFieldNames ? '' : 'Criticality', $pb.PbFieldType.OE, protoName: 'Criticality', defaultOrMaker: $0.ClaimCriticality.CLAIM_CRITICALITY_UNKNOWN, valueOf: $0.ClaimCriticality.valueOf, enumValues: $0.ClaimCriticality.values)
-    ..aOM<$1.ClaimStatusStruct>(4, _omitFieldNames ? '' : 'Status', protoName: 'Status', subBuilder: $1.ClaimStatusStruct.create)
+    ..e<$3.ClaimCriticality>(3, _omitFieldNames ? '' : 'Criticality', $pb.PbFieldType.OE, protoName: 'Criticality', defaultOrMaker: $3.ClaimCriticality.CLAIM_CRITICALITY_UNKNOWN, valueOf: $3.ClaimCriticality.valueOf, enumValues: $3.ClaimCriticality.values)
+    ..aOM<$70.ClaimStatusStruct>(4, _omitFieldNames ? '' : 'Status', protoName: 'Status', subBuilder: $70.ClaimStatusStruct.create)
    ..aOS(6, _omitFieldNames ? '' : 'CreationDate', protoName: 'CreationDate')
    ..pPS(7, _omitFieldNames ? '' : 'Assignees', protoName: 'Assignees')
    ..aOS(8, _omitFieldNames ? '' : 'EndComment', protoName: 'EndComment')
-    ..aOM<$0.ClaimClosure>(9, _omitFieldNames ? '' : 'Closure', protoName: 'Closure', subBuilder: $0.ClaimClosure.create)
-    ..pc<$0.AttachmentSummary>(10, _omitFieldNames ? '' : 'Attachments', $pb.PbFieldType.PM, protoName: 'Attachments', subBuilder: $0.AttachmentSummary.create)
+    ..aOM<$3.ClaimClosure>(9, _omitFieldNames ? '' : 'Closure', protoName: 'Closure', subBuilder: $3.ClaimClosure.create)
+    ..pc<$3.AttachmentSummary>(10, _omitFieldNames ? '' : 'Attachments', $pb.PbFieldType.PM, protoName: 'Attachments', subBuilder: $3.AttachmentSummary.create)
    ..a<$core.int>(11, _omitFieldNames ? '' : 'AttachmentNumber', $pb.PbFieldType.O3, protoName: 'AttachmentNumber')
-    ..aOM<$0.Amount>(12, _omitFieldNames ? '' : 'Amount', protoName: 'Amount', subBuilder: $0.Amount.create)
+    ..aOM<$3.Amount>(12, _omitFieldNames ? '' : 'Amount', protoName: 'Amount', subBuilder: $3.Amount.create)
    ..aOS(13, _omitFieldNames ? '' : 'Reason', protoName: 'Reason')
-    ..e<$0.ClaimSector>(14, _omitFieldNames ? '' : 'Sector', $pb.PbFieldType.OE, protoName: 'Sector', defaultOrMaker: $0.ClaimSector.CLAIM_SECTOR_UNKNOWN, valueOf: $0.ClaimSector.valueOf, enumValues: $0.ClaimSector.values)
-    ..e<$0.ClaimEntityType>(15, _omitFieldNames ? '' : 'EntityType', $pb.PbFieldType.OE, protoName: 'EntityType', defaultOrMaker: $0.ClaimEntityType.CLAIM_ENTITY_TYPE_UNKNOWN, valueOf: $0.ClaimEntityType.valueOf, enumValues: $0.ClaimEntityType.values)
+    ..e<$3.ClaimSector>(14, _omitFieldNames ? '' : 'Sector', $pb.PbFieldType.OE, protoName: 'Sector', defaultOrMaker: $3.ClaimSector.CLAIM_SECTOR_UNKNOWN, valueOf: $3.ClaimSector.valueOf, enumValues: $3.ClaimSector.values)
+    ..e<$3.ClaimEntityType>(15, _omitFieldNames ? '' : 'EntityType', $pb.PbFieldType.OE, protoName: 'EntityType', defaultOrMaker: $3.ClaimEntityType.CLAIM_ENTITY_TYPE_UNKNOWN, valueOf: $3.ClaimEntityType.valueOf, enumValues: $3.ClaimEntityType.values)
    ..pPS(16, _omitFieldNames ? '' : 'RemovedAssignees', protoName: 'RemovedAssignees')
    ..pPS(17, _omitFieldNames ? '' : 'AddedAssignees', protoName: 'AddedAssignees')
    ..aOS(18, _omitFieldNames ? '' : 'ReasonCode', protoName: 'ReasonCode')
-    ..pc<$0.MetadataElement>(19, _omitFieldNames ? '' : 'MetaData', $pb.PbFieldType.PM, protoName: 'MetaData', subBuilder: $0.MetadataElement.create)
+    ..pc<$3.MetadataElement>(19, _omitFieldNames ? '' : 'MetaData', $pb.PbFieldType.PM, protoName: 'MetaData', subBuilder: $3.MetadataElement.create)
    ..aOS(20, _omitFieldNames ? '' : 'Title', protoName: 'Title')
    ..aOS(21, _omitFieldNames ? '' : 'DisplayID', protoName: 'DisplayID')
-    ..aOS(22, _omitFieldNames ? '' : 'Message', protoName: 'Message')
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  ClaimPayload clone() => ClaimPayload()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  ClaimPayload copyWith(void Function(ClaimPayload) updates) => super.copyWith((message) => updates(message as ClaimPayload)) as ClaimPayload;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static ClaimPayload create() => ClaimPayload._();
-  @$core.override
  ClaimPayload createEmptyInstance() => create();
  static $pb.PbList<ClaimPayload> createRepeated() => $pb.PbList<ClaimPayload>();
  @$core.pragma('dart2js:noInline')
@@ -197,7 +244,7 @@ class ClaimPayload extends $pb.GeneratedMessage {
  @$pb.TagNumber(1)
  $core.String get claimTypeID => $_getSZ(0);
  @$pb.TagNumber(1)
-  set claimTypeID($core.String value) => $_setString(0, value);
+  set claimTypeID($core.String v) { $_setString(0, v); }
  @$pb.TagNumber(1)
  $core.bool hasClaimTypeID() => $_has(0);
  @$pb.TagNumber(1)
@@ -207,7 +254,7 @@ class ClaimPayload extends $pb.GeneratedMessage {
  @$pb.TagNumber(2)
  $core.String get entityID => $_getSZ(1);
  @$pb.TagNumber(2)
-  set entityID($core.String value) => $_setString(1, value);
+  set entityID($core.String v) { $_setString(1, v); }
  @$pb.TagNumber(2)
  $core.bool hasEntityID() => $_has(1);
  @$pb.TagNumber(2)
@@ -215,9 +262,9 @@ class ClaimPayload extends $pb.GeneratedMessage {

  /// Criticality of the claim
  @$pb.TagNumber(3)
-  $0.ClaimCriticality get criticality => $_getN(2);
+  $3.ClaimCriticality get criticality => $_getN(2);
  @$pb.TagNumber(3)
-  set criticality($0.ClaimCriticality value) => $_setField(3, value);
+  set criticality($3.ClaimCriticality v) { $_setField(3, v); }
  @$pb.TagNumber(3)
  $core.bool hasCriticality() => $_has(2);
  @$pb.TagNumber(3)
@@ -225,21 +272,21 @@ class ClaimPayload extends $pb.GeneratedMessage {

  /// Status of the claim
  @$pb.TagNumber(4)
-  $1.ClaimStatusStruct get status => $_getN(3);
+  $70.ClaimStatusStruct get status => $_getN(3);
  @$pb.TagNumber(4)
-  set status($1.ClaimStatusStruct value) => $_setField(4, value);
+  set status($70.ClaimStatusStruct v) { $_setField(4, v); }
  @$pb.TagNumber(4)
  $core.bool hasStatus() => $_has(3);
  @$pb.TagNumber(4)
  void clearStatus() => $_clearField(4);
  @$pb.TagNumber(4)
-  $1.ClaimStatusStruct ensureStatus() => $_ensure(3);
+  $70.ClaimStatusStruct ensureStatus() => $_ensure(3);

  /// Creation date of the claim
  @$pb.TagNumber(6)
  $core.String get creationDate => $_getSZ(4);
  @$pb.TagNumber(6)
-  set creationDate($core.String value) => $_setString(4, value);
+  set creationDate($core.String v) { $_setString(4, v); }
  @$pb.TagNumber(6)
  $core.bool hasCreationDate() => $_has(4);
  @$pb.TagNumber(6)
@@ -253,7 +300,7 @@ class ClaimPayload extends $pb.GeneratedMessage {
  @$pb.TagNumber(8)
  $core.String get endComment => $_getSZ(6);
  @$pb.TagNumber(8)
-  set endComment($core.String value) => $_setString(6, value);
+  set endComment($core.String v) { $_setString(6, v); }
  @$pb.TagNumber(8)
  $core.bool hasEndComment() => $_has(6);
  @$pb.TagNumber(8)
@@ -261,61 +308,61 @@ class ClaimPayload extends $pb.GeneratedMessage {

  /// Closure responsible and causes of the claim
  @$pb.TagNumber(9)
-  $0.ClaimClosure get closure => $_getN(7);
+  $3.ClaimClosure get closure => $_getN(7);
  @$pb.TagNumber(9)
-  set closure($0.ClaimClosure value) => $_setField(9, value);
+  set closure($3.ClaimClosure v) { $_setField(9, v); }
  @$pb.TagNumber(9)
  $core.bool hasClosure() => $_has(7);
  @$pb.TagNumber(9)
  void clearClosure() => $_clearField(9);
  @$pb.TagNumber(9)
-  $0.ClaimClosure ensureClosure() => $_ensure(7);
+  $3.ClaimClosure ensureClosure() => $_ensure(7);

  @$pb.TagNumber(10)
-  $pb.PbList<$0.AttachmentSummary> get attachments => $_getList(8);
+  $pb.PbList<$3.AttachmentSummary> get attachments => $_getList(8);

  @$pb.TagNumber(11)
  $core.int get attachmentNumber => $_getIZ(9);
  @$pb.TagNumber(11)
-  set attachmentNumber($core.int value) => $_setSignedInt32(9, value);
+  set attachmentNumber($core.int v) { $_setSignedInt32(9, v); }
  @$pb.TagNumber(11)
  $core.bool hasAttachmentNumber() => $_has(9);
  @$pb.TagNumber(11)
  void clearAttachmentNumber() => $_clearField(11);

  @$pb.TagNumber(12)
-  $0.Amount get amount => $_getN(10);
+  $3.Amount get amount => $_getN(10);
  @$pb.TagNumber(12)
-  set amount($0.Amount value) => $_setField(12, value);
+  set amount($3.Amount v) { $_setField(12, v); }
  @$pb.TagNumber(12)
  $core.bool hasAmount() => $_has(10);
  @$pb.TagNumber(12)
  void clearAmount() => $_clearField(12);
  @$pb.TagNumber(12)
-  $0.Amount ensureAmount() => $_ensure(10);
+  $3.Amount ensureAmount() => $_ensure(10);

  @$pb.TagNumber(13)
  $core.String get reason => $_getSZ(11);
  @$pb.TagNumber(13)
-  set reason($core.String value) => $_setString(11, value);
+  set reason($core.String v) { $_setString(11, v); }
  @$pb.TagNumber(13)
  $core.bool hasReason() => $_has(11);
  @$pb.TagNumber(13)
  void clearReason() => $_clearField(13);

  @$pb.TagNumber(14)
-  $0.ClaimSector get sector => $_getN(12);
+  $3.ClaimSector get sector => $_getN(12);
  @$pb.TagNumber(14)
-  set sector($0.ClaimSector value) => $_setField(14, value);
+  set sector($3.ClaimSector v) { $_setField(14, v); }
  @$pb.TagNumber(14)
  $core.bool hasSector() => $_has(12);
  @$pb.TagNumber(14)
  void clearSector() => $_clearField(14);

  @$pb.TagNumber(15)
-  $0.ClaimEntityType get entityType => $_getN(13);
+  $3.ClaimEntityType get entityType => $_getN(13);
  @$pb.TagNumber(15)
-  set entityType($0.ClaimEntityType value) => $_setField(15, value);
+  set entityType($3.ClaimEntityType v) { $_setField(15, v); }
  @$pb.TagNumber(15)
  $core.bool hasEntityType() => $_has(13);
  @$pb.TagNumber(15)
@@ -332,7 +379,7 @@ class ClaimPayload extends $pb.GeneratedMessage {
  @$pb.TagNumber(18)
  $core.String get reasonCode => $_getSZ(16);
  @$pb.TagNumber(18)
-  set reasonCode($core.String value) => $_setString(16, value);
+  set reasonCode($core.String v) { $_setString(16, v); }
  @$pb.TagNumber(18)
  $core.bool hasReasonCode() => $_has(16);
  @$pb.TagNumber(18)
@@ -340,13 +387,13 @@ class ClaimPayload extends $pb.GeneratedMessage {

  /// Metadata are characteristics specific to the project. They can be of several data form (string, integer, float, boolean or timestamp)
  @$pb.TagNumber(19)
-  $pb.PbList<$0.MetadataElement> get metaData => $_getList(17);
+  $pb.PbList<$3.MetadataElement> get metaData => $_getList(17);

  /// Title of the claim
  @$pb.TagNumber(20)
  $core.String get title => $_getSZ(18);
  @$pb.TagNumber(20)
-  set title($core.String value) => $_setString(18, value);
+  set title($core.String v) { $_setString(18, v); }
  @$pb.TagNumber(20)
  $core.bool hasTitle() => $_has(18);
  @$pb.TagNumber(20)
@@ -356,20 +403,11 @@ class ClaimPayload extends $pb.GeneratedMessage {
  @$pb.TagNumber(21)
  $core.String get displayID => $_getSZ(19);
  @$pb.TagNumber(21)
-  set displayID($core.String value) => $_setString(19, value);
+  set displayID($core.String v) { $_setString(19, v); }
  @$pb.TagNumber(21)
  $core.bool hasDisplayID() => $_has(19);
  @$pb.TagNumber(21)
  void clearDisplayID() => $_clearField(21);
-
-  @$pb.TagNumber(22)
-  $core.String get message => $_getSZ(20);
-  @$pb.TagNumber(22)
-  set message($core.String value) => $_setString(20, value);
-  @$pb.TagNumber(22)
-  $core.bool hasMessage() => $_has(20);
-  @$pb.TagNumber(22)
-  void clearMessage() => $_clearField(22);
 }

 class ClaimTriplet extends $pb.GeneratedMessage {
@@ -378,17 +416,21 @@ class ClaimTriplet extends $pb.GeneratedMessage {
    Claim? previous,
    Claim? lastEvent,
  }) {
-    final result = create();
-    if (current != null) result.current = current;
-    if (previous != null) result.previous = previous;
-    if (lastEvent != null) result.lastEvent = lastEvent;
-    return result;
+    final $result = create();
+    if (current != null) {
+      $result.current = current;
+    }
+    if (previous != null) {
+      $result.previous = previous;
+    }
+    if (lastEvent != null) {
+      $result.lastEvent = lastEvent;
+    }
+    return $result;
  }
-
-  ClaimTriplet._();
-
-  factory ClaimTriplet.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory ClaimTriplet.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  ClaimTriplet._() : super();
+  factory ClaimTriplet.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory ClaimTriplet.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ClaimTriplet', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
    ..aOM<Claim>(1, _omitFieldNames ? '' : 'Current', protoName: 'Current', subBuilder: Claim.create)
@@ -397,17 +439,21 @@ class ClaimTriplet extends $pb.GeneratedMessage {
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  ClaimTriplet clone() => ClaimTriplet()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  ClaimTriplet copyWith(void Function(ClaimTriplet) updates) => super.copyWith((message) => updates(message as ClaimTriplet)) as ClaimTriplet;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static ClaimTriplet create() => ClaimTriplet._();
-  @$core.override
  ClaimTriplet createEmptyInstance() => create();
  static $pb.PbList<ClaimTriplet> createRepeated() => $pb.PbList<ClaimTriplet>();
  @$core.pragma('dart2js:noInline')
@@ -417,7 +463,7 @@ class ClaimTriplet extends $pb.GeneratedMessage {
  @$pb.TagNumber(1)
  Claim get current => $_getN(0);
  @$pb.TagNumber(1)
-  set current(Claim value) => $_setField(1, value);
+  set current(Claim v) { $_setField(1, v); }
  @$pb.TagNumber(1)
  $core.bool hasCurrent() => $_has(0);
  @$pb.TagNumber(1)
@@ -428,7 +474,7 @@ class ClaimTriplet extends $pb.GeneratedMessage {
  @$pb.TagNumber(2)
  Claim get previous => $_getN(1);
  @$pb.TagNumber(2)
-  set previous(Claim value) => $_setField(2, value);
+  set previous(Claim v) { $_setField(2, v); }
  @$pb.TagNumber(2)
  $core.bool hasPrevious() => $_has(1);
  @$pb.TagNumber(2)
@@ -439,7 +485,7 @@ class ClaimTriplet extends $pb.GeneratedMessage {
  @$pb.TagNumber(3)
  Claim get lastEvent => $_getN(2);
  @$pb.TagNumber(3)
-  set lastEvent(Claim value) => $_setField(3, value);
+  set lastEvent(Claim v) { $_setField(3, v); }
  @$pb.TagNumber(3)
  $core.bool hasLastEvent() => $_has(2);
  @$pb.TagNumber(3)
@@ -449,5 +495,5 @@ class ClaimTriplet extends $pb.GeneratedMessage {
 }


-const $core.bool _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
-const $core.bool _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
+const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
+const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
--- a/lib/claim.pbenum.dart
+++ b/lib/claim.pbenum.dart
@@ -1,12 +1,11 @@
-// This is a generated file - do not edit.
 //
-// Generated from claim.proto.
-
+//  Generated code. Do not modify.
+//  source: claim.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

--- a/lib/claim.pbjson.dart
+++ b/lib/claim.pbjson.dart
@@ -1,14 +1,13 @@
-// This is a generated file - do not edit.
 //
-// Generated from claim.proto.
-
+//  Generated code. Do not modify.
+//  source: claim.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
@@ -56,7 +55,6 @@ const ClaimPayload$json = {
    {'1': 'MetaData', '3': 19, '4': 3, '5': 11, '6': '.api.MetadataElement', '8': {}, '10': 'MetaData'},
    {'1': 'Title', '3': 20, '4': 1, '5': 9, '8': {}, '10': 'Title'},
    {'1': 'DisplayID', '3': 21, '4': 1, '5': 9, '8': {}, '10': 'DisplayID'},
-    {'1': 'Message', '3': 22, '4': 1, '5': 9, '8': {}, '10': 'Message'},
  ],
  '7': {},
 };
@@ -100,9 +98,8 @@ final $typed_data.Uint8List claimPayloadDescriptor = $convert.base64Decode(
    'aGUgY2xhaW1SBVRpdGxlErYBCglEaXNwbGF5SUQYFSABKAlClwGSQUAyPklkZW50aWZpZXIgdG'
    '8gZGlzcGxheSwgYmVjYXVzZSBpdCBtYXkgZGlmZmVyIGZyb20gdGhlIEVudGl0eUlE+kIEcgIQ'
    'AcrCGBwKGgoBKhIVZ2VuZXJhdGVkVGV4dCxrZXl3b3Jk0sIYEgoQCgVDbGFpbRIFY2xhaW0YAd'
-    'rCGBMKEQoBKhIMc2hvcnRLZXl3b3JkUglEaXNwbGF5SUQSKQoHTWVzc2FnZRgWIAEoCUIP8sEY'
-    'C01lc3NhZ2VTZW50UgdNZXNzYWdlOjWSQTIKMNIBC0NsYWltVHlwZUlE0gEIRW50aXR5SUTSAQ'
-    'tDcml0aWNhbGl0edIBBlN0YXR1cw==');
+    'rCGBMKEQoBKhIMc2hvcnRLZXl3b3JkUglEaXNwbGF5SUQ6NZJBMgow0gELQ2xhaW1UeXBlSUTS'
+    'AQhFbnRpdHlJRNIBC0NyaXRpY2FsaXR50gEGU3RhdHVz');

@$core.Deprecated('Use claimTripletDescriptor instead')
 const ClaimTriplet$json = {
--- a/lib/claimAction.pb.dart
+++ b/lib/claimAction.pb.dart
--- a/lib/claimAction.pbenum.dart
+++ b/lib/claimAction.pbenum.dart
@@ -1,12 +1,11 @@
-// This is a generated file - do not edit.
 //
-// Generated from claimAction.proto.
-
+//  Generated code. Do not modify.
+//  source: claimAction.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

--- a/lib/claimAction.pbjson.dart
+++ b/lib/claimAction.pbjson.dart
@@ -1,14 +1,13 @@
-// This is a generated file - do not edit.
 //
-// Generated from claimAction.proto.
-
+//  Generated code. Do not modify.
+//  source: claimAction.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
@@ -32,7 +31,6 @@ const ClaimNotifyPayload$json = {
    {'1': 'Title', '3': 12, '4': 1, '5': 9, '10': 'Title'},
    {'1': 'MetaData', '3': 13, '4': 3, '5': 11, '6': '.api.MetadataElement', '10': 'MetaData'},
    {'1': 'DisplayID', '3': 14, '4': 1, '5': 9, '10': 'DisplayID'},
-    {'1': 'Message', '3': 15, '4': 1, '5': 9, '10': 'Message'},
  ],
  '7': {},
 };
@@ -49,8 +47,7 @@ final $typed_data.Uint8List claimNotifyPayloadDescriptor = $convert.base64Decode
    'lwZRgKIAEoDjIULmFwaS5DbGFpbUVudGl0eVR5cGVSCkVudGl0eVR5cGUSGgoIRW50aXR5SUQY'
    'CyABKAlSCEVudGl0eUlEEhQKBVRpdGxlGAwgASgJUgVUaXRsZRIwCghNZXRhRGF0YRgNIAMoCz'
    'IULmFwaS5NZXRhZGF0YUVsZW1lbnRSCE1ldGFEYXRhEhwKCURpc3BsYXlJRBgOIAEoCVIJRGlz'
-    'cGxheUlEEhgKB01lc3NhZ2UYDyABKAlSB01lc3NhZ2U6GaK7GAdDb21tYW5kqLsYAbK7GAZOb3'
-    'RpZnk=');
+    'cGxheUlEOhmiuxgHQ29tbWFuZKi7GAGyuxgGTm90aWZ5');

@$core.Deprecated('Use claimNotifyDescriptor instead')
 const ClaimNotify$json = {
--- a/lib/claimInput.pb.dart
+++ b/lib/claimInput.pb.dart
--- a/lib/claimInput.pbenum.dart
+++ b/lib/claimInput.pbenum.dart
@@ -1,12 +1,11 @@
-// This is a generated file - do not edit.
 //
-// Generated from claimInput.proto.
-
+//  Generated code. Do not modify.
+//  source: claimInput.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

--- a/lib/claimInput.pbgrpc.dart
+++ b/lib/claimInput.pbgrpc.dart
@@ -1,14 +1,13 @@
-// This is a generated file - do not edit.
 //
-// Generated from claimInput.proto.
-
+//  Generated code. Do not modify.
+//  source: claimInput.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:async' as $async;
 import 'dart:core' as $core;
@@ -16,130 +15,118 @@ import 'dart:core' as $core;
 import 'package:grpc/service_api.dart' as $grpc;
 import 'package:protobuf/protobuf.dart' as $pb;

-import 'claimInput.pb.dart' as $0;
+import 'claimInput.pb.dart' as $11;

 export 'claimInput.pb.dart';

-///
-/// API-server services
@$pb.GrpcServiceName('api.ClaimInputAPI')
 class ClaimInputAPIClient extends $grpc.Client {
-  /// The hostname for this service.
-  static const $core.String defaultHost = '';
-
-  /// OAuth scopes needed for the client.
-  static const $core.List<$core.String> oauthScopes = [
-    '',
-  ];
+  static final _$created = $grpc.ClientMethod<$11.ClaimCreatedRequest, $11.ClaimCreatedResponse>(
+      '/api.ClaimInputAPI/Created',
+      ($11.ClaimCreatedRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $11.ClaimCreatedResponse.fromBuffer(value));
+  static final _$completed = $grpc.ClientMethod<$11.ClaimCompletedRequest, $11.ClaimCompletedResponse>(
+      '/api.ClaimInputAPI/Completed',
+      ($11.ClaimCompletedRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $11.ClaimCompletedResponse.fromBuffer(value));
+  static final _$criticalityUpdated = $grpc.ClientMethod<$11.ClaimCriticalityUpdatedRequest, $11.ClaimCriticalityUpdatedResponse>(
+      '/api.ClaimInputAPI/CriticalityUpdated',
+      ($11.ClaimCriticalityUpdatedRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $11.ClaimCriticalityUpdatedResponse.fromBuffer(value));
+  static final _$statusUpdated = $grpc.ClientMethod<$11.ClaimStatusUpdatedRequest, $11.ClaimStatusUpdatedResponse>(
+      '/api.ClaimInputAPI/StatusUpdated',
+      ($11.ClaimStatusUpdatedRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $11.ClaimStatusUpdatedResponse.fromBuffer(value));
+  static final _$assigneesAdded = $grpc.ClientMethod<$11.ClaimAssigneesAddedRequest, $11.ClaimAssigneesAddedResponse>(
+      '/api.ClaimInputAPI/AssigneesAdded',
+      ($11.ClaimAssigneesAddedRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $11.ClaimAssigneesAddedResponse.fromBuffer(value));
+  static final _$assigneesRemoved = $grpc.ClientMethod<$11.ClaimAssigneesRemovedRequest, $11.ClaimAssigneesRemovedResponse>(
+      '/api.ClaimInputAPI/AssigneesRemoved',
+      ($11.ClaimAssigneesRemovedRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $11.ClaimAssigneesRemovedResponse.fromBuffer(value));
+  static final _$amountUpdated = $grpc.ClientMethod<$11.ClaimAmountUpdatedRequest, $11.ClaimAmountUpdatedResponse>(
+      '/api.ClaimInputAPI/AmountUpdated',
+      ($11.ClaimAmountUpdatedRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $11.ClaimAmountUpdatedResponse.fromBuffer(value));
+  static final _$attachmentAdded = $grpc.ClientMethod<$11.ClaimAttachmentAddedRequest, $11.ClaimAttachmentAddedResponse>(
+      '/api.ClaimInputAPI/AttachmentAdded',
+      ($11.ClaimAttachmentAddedRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $11.ClaimAttachmentAddedResponse.fromBuffer(value));
+  static final _$attachmentRemoved = $grpc.ClientMethod<$11.ClaimAttachmentRemovedRequest, $11.ClaimAttachmentRemovedResponse>(
+      '/api.ClaimInputAPI/AttachmentRemoved',
+      ($11.ClaimAttachmentRemovedRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $11.ClaimAttachmentRemovedResponse.fromBuffer(value));
+  static final _$metaDataUpdated = $grpc.ClientMethod<$11.ClaimMetaDataUpdatedRequest, $11.ClaimMetaDataUpdatedResponse>(
+      '/api.ClaimInputAPI/MetaDataUpdated',
+      ($11.ClaimMetaDataUpdatedRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $11.ClaimMetaDataUpdatedResponse.fromBuffer(value));
+  static final _$titleUpdated = $grpc.ClientMethod<$11.ClaimTitleUpdatedRequest, $11.ClaimTitleUpdatedResponse>(
+      '/api.ClaimInputAPI/TitleUpdated',
+      ($11.ClaimTitleUpdatedRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $11.ClaimTitleUpdatedResponse.fromBuffer(value));
+  static final _$messageSent = $grpc.ClientMethod<$11.ClaimMessageSentRequest, $11.ClaimMessageSentResponse>(
+      '/api.ClaimInputAPI/MessageSent',
+      ($11.ClaimMessageSentRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $11.ClaimMessageSentResponse.fromBuffer(value));
+  static final _$deleted = $grpc.ClientMethod<$11.ClaimDeletedRequest, $11.ClaimDeletedResponse>(
+      '/api.ClaimInputAPI/Deleted',
+      ($11.ClaimDeletedRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $11.ClaimDeletedResponse.fromBuffer(value));

  ClaimInputAPIClient(super.channel, {super.options, super.interceptors});

-  $grpc.ResponseFuture<$0.ClaimCreatedResponse> created($0.ClaimCreatedRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$11.ClaimCreatedResponse> created($11.ClaimCreatedRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$created, request, options: options);
  }

-  $grpc.ResponseFuture<$0.ClaimCompletedResponse> completed($0.ClaimCompletedRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$11.ClaimCompletedResponse> completed($11.ClaimCompletedRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$completed, request, options: options);
  }

-  $grpc.ResponseFuture<$0.ClaimCriticalityUpdatedResponse> criticalityUpdated($0.ClaimCriticalityUpdatedRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$11.ClaimCriticalityUpdatedResponse> criticalityUpdated($11.ClaimCriticalityUpdatedRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$criticalityUpdated, request, options: options);
  }

-  $grpc.ResponseFuture<$0.ClaimStatusUpdatedResponse> statusUpdated($0.ClaimStatusUpdatedRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$11.ClaimStatusUpdatedResponse> statusUpdated($11.ClaimStatusUpdatedRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$statusUpdated, request, options: options);
  }

-  $grpc.ResponseFuture<$0.ClaimAssigneesAddedResponse> assigneesAdded($0.ClaimAssigneesAddedRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$11.ClaimAssigneesAddedResponse> assigneesAdded($11.ClaimAssigneesAddedRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$assigneesAdded, request, options: options);
  }

-  $grpc.ResponseFuture<$0.ClaimAssigneesRemovedResponse> assigneesRemoved($0.ClaimAssigneesRemovedRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$11.ClaimAssigneesRemovedResponse> assigneesRemoved($11.ClaimAssigneesRemovedRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$assigneesRemoved, request, options: options);
  }

-  $grpc.ResponseFuture<$0.ClaimAmountUpdatedResponse> amountUpdated($0.ClaimAmountUpdatedRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$11.ClaimAmountUpdatedResponse> amountUpdated($11.ClaimAmountUpdatedRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$amountUpdated, request, options: options);
  }

-  $grpc.ResponseFuture<$0.ClaimAttachmentAddedResponse> attachmentAdded($0.ClaimAttachmentAddedRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$11.ClaimAttachmentAddedResponse> attachmentAdded($11.ClaimAttachmentAddedRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$attachmentAdded, request, options: options);
  }

-  $grpc.ResponseFuture<$0.ClaimAttachmentRemovedResponse> attachmentRemoved($0.ClaimAttachmentRemovedRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$11.ClaimAttachmentRemovedResponse> attachmentRemoved($11.ClaimAttachmentRemovedRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$attachmentRemoved, request, options: options);
  }

-  $grpc.ResponseFuture<$0.ClaimMetaDataUpdatedResponse> metaDataUpdated($0.ClaimMetaDataUpdatedRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$11.ClaimMetaDataUpdatedResponse> metaDataUpdated($11.ClaimMetaDataUpdatedRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$metaDataUpdated, request, options: options);
  }

-  $grpc.ResponseFuture<$0.ClaimTitleUpdatedResponse> titleUpdated($0.ClaimTitleUpdatedRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$11.ClaimTitleUpdatedResponse> titleUpdated($11.ClaimTitleUpdatedRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$titleUpdated, request, options: options);
  }

-  $grpc.ResponseFuture<$0.ClaimMessageSentResponse> messageSent($0.ClaimMessageSentRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$11.ClaimMessageSentResponse> messageSent($11.ClaimMessageSentRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$messageSent, request, options: options);
  }

-  $grpc.ResponseFuture<$0.ClaimDeletedResponse> deleted($0.ClaimDeletedRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$11.ClaimDeletedResponse> deleted($11.ClaimDeletedRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$deleted, request, options: options);
  }
-
-    // method descriptors
-
-  static final _$created = $grpc.ClientMethod<$0.ClaimCreatedRequest, $0.ClaimCreatedResponse>(
-      '/api.ClaimInputAPI/Created',
-      ($0.ClaimCreatedRequest value) => value.writeToBuffer(),
-      $0.ClaimCreatedResponse.fromBuffer);
-  static final _$completed = $grpc.ClientMethod<$0.ClaimCompletedRequest, $0.ClaimCompletedResponse>(
-      '/api.ClaimInputAPI/Completed',
-      ($0.ClaimCompletedRequest value) => value.writeToBuffer(),
-      $0.ClaimCompletedResponse.fromBuffer);
-  static final _$criticalityUpdated = $grpc.ClientMethod<$0.ClaimCriticalityUpdatedRequest, $0.ClaimCriticalityUpdatedResponse>(
-      '/api.ClaimInputAPI/CriticalityUpdated',
-      ($0.ClaimCriticalityUpdatedRequest value) => value.writeToBuffer(),
-      $0.ClaimCriticalityUpdatedResponse.fromBuffer);
-  static final _$statusUpdated = $grpc.ClientMethod<$0.ClaimStatusUpdatedRequest, $0.ClaimStatusUpdatedResponse>(
-      '/api.ClaimInputAPI/StatusUpdated',
-      ($0.ClaimStatusUpdatedRequest value) => value.writeToBuffer(),
-      $0.ClaimStatusUpdatedResponse.fromBuffer);
-  static final _$assigneesAdded = $grpc.ClientMethod<$0.ClaimAssigneesAddedRequest, $0.ClaimAssigneesAddedResponse>(
-      '/api.ClaimInputAPI/AssigneesAdded',
-      ($0.ClaimAssigneesAddedRequest value) => value.writeToBuffer(),
-      $0.ClaimAssigneesAddedResponse.fromBuffer);
-  static final _$assigneesRemoved = $grpc.ClientMethod<$0.ClaimAssigneesRemovedRequest, $0.ClaimAssigneesRemovedResponse>(
-      '/api.ClaimInputAPI/AssigneesRemoved',
-      ($0.ClaimAssigneesRemovedRequest value) => value.writeToBuffer(),
-      $0.ClaimAssigneesRemovedResponse.fromBuffer);
-  static final _$amountUpdated = $grpc.ClientMethod<$0.ClaimAmountUpdatedRequest, $0.ClaimAmountUpdatedResponse>(
-      '/api.ClaimInputAPI/AmountUpdated',
-      ($0.ClaimAmountUpdatedRequest value) => value.writeToBuffer(),
-      $0.ClaimAmountUpdatedResponse.fromBuffer);
-  static final _$attachmentAdded = $grpc.ClientMethod<$0.ClaimAttachmentAddedRequest, $0.ClaimAttachmentAddedResponse>(
-      '/api.ClaimInputAPI/AttachmentAdded',
-      ($0.ClaimAttachmentAddedRequest value) => value.writeToBuffer(),
-      $0.ClaimAttachmentAddedResponse.fromBuffer);
-  static final _$attachmentRemoved = $grpc.ClientMethod<$0.ClaimAttachmentRemovedRequest, $0.ClaimAttachmentRemovedResponse>(
-      '/api.ClaimInputAPI/AttachmentRemoved',
-      ($0.ClaimAttachmentRemovedRequest value) => value.writeToBuffer(),
-      $0.ClaimAttachmentRemovedResponse.fromBuffer);
-  static final _$metaDataUpdated = $grpc.ClientMethod<$0.ClaimMetaDataUpdatedRequest, $0.ClaimMetaDataUpdatedResponse>(
-      '/api.ClaimInputAPI/MetaDataUpdated',
-      ($0.ClaimMetaDataUpdatedRequest value) => value.writeToBuffer(),
-      $0.ClaimMetaDataUpdatedResponse.fromBuffer);
-  static final _$titleUpdated = $grpc.ClientMethod<$0.ClaimTitleUpdatedRequest, $0.ClaimTitleUpdatedResponse>(
-      '/api.ClaimInputAPI/TitleUpdated',
-      ($0.ClaimTitleUpdatedRequest value) => value.writeToBuffer(),
-      $0.ClaimTitleUpdatedResponse.fromBuffer);
-  static final _$messageSent = $grpc.ClientMethod<$0.ClaimMessageSentRequest, $0.ClaimMessageSentResponse>(
-      '/api.ClaimInputAPI/MessageSent',
-      ($0.ClaimMessageSentRequest value) => value.writeToBuffer(),
-      $0.ClaimMessageSentResponse.fromBuffer);
-  static final _$deleted = $grpc.ClientMethod<$0.ClaimDeletedRequest, $0.ClaimDeletedResponse>(
-      '/api.ClaimInputAPI/Deleted',
-      ($0.ClaimDeletedRequest value) => value.writeToBuffer(),
-      $0.ClaimDeletedResponse.fromBuffer);
 }

@$pb.GrpcServiceName('api.ClaimInputAPI')
@@ -147,175 +134,162 @@ abstract class ClaimInputAPIServiceBase extends $grpc.Service {
  $core.String get $name => 'api.ClaimInputAPI';

  ClaimInputAPIServiceBase() {
-    $addMethod($grpc.ServiceMethod<$0.ClaimCreatedRequest, $0.ClaimCreatedResponse>(
+    $addMethod($grpc.ServiceMethod<$11.ClaimCreatedRequest, $11.ClaimCreatedResponse>(
        'Created',
        created_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.ClaimCreatedRequest.fromBuffer(value),
-        ($0.ClaimCreatedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.ClaimCompletedRequest, $0.ClaimCompletedResponse>(
+        ($core.List<$core.int> value) => $11.ClaimCreatedRequest.fromBuffer(value),
+        ($11.ClaimCreatedResponse value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$11.ClaimCompletedRequest, $11.ClaimCompletedResponse>(
        'Completed',
        completed_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.ClaimCompletedRequest.fromBuffer(value),
-        ($0.ClaimCompletedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.ClaimCriticalityUpdatedRequest, $0.ClaimCriticalityUpdatedResponse>(
+        ($core.List<$core.int> value) => $11.ClaimCompletedRequest.fromBuffer(value),
+        ($11.ClaimCompletedResponse value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$11.ClaimCriticalityUpdatedRequest, $11.ClaimCriticalityUpdatedResponse>(
        'CriticalityUpdated',
        criticalityUpdated_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.ClaimCriticalityUpdatedRequest.fromBuffer(value),
-        ($0.ClaimCriticalityUpdatedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.ClaimStatusUpdatedRequest, $0.ClaimStatusUpdatedResponse>(
+        ($core.List<$core.int> value) => $11.ClaimCriticalityUpdatedRequest.fromBuffer(value),
+        ($11.ClaimCriticalityUpdatedResponse value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$11.ClaimStatusUpdatedRequest, $11.ClaimStatusUpdatedResponse>(
        'StatusUpdated',
        statusUpdated_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.ClaimStatusUpdatedRequest.fromBuffer(value),
-        ($0.ClaimStatusUpdatedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.ClaimAssigneesAddedRequest, $0.ClaimAssigneesAddedResponse>(
+        ($core.List<$core.int> value) => $11.ClaimStatusUpdatedRequest.fromBuffer(value),
+        ($11.ClaimStatusUpdatedResponse value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$11.ClaimAssigneesAddedRequest, $11.ClaimAssigneesAddedResponse>(
        'AssigneesAdded',
        assigneesAdded_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.ClaimAssigneesAddedRequest.fromBuffer(value),
-        ($0.ClaimAssigneesAddedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.ClaimAssigneesRemovedRequest, $0.ClaimAssigneesRemovedResponse>(
+        ($core.List<$core.int> value) => $11.ClaimAssigneesAddedRequest.fromBuffer(value),
+        ($11.ClaimAssigneesAddedResponse value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$11.ClaimAssigneesRemovedRequest, $11.ClaimAssigneesRemovedResponse>(
        'AssigneesRemoved',
        assigneesRemoved_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.ClaimAssigneesRemovedRequest.fromBuffer(value),
-        ($0.ClaimAssigneesRemovedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.ClaimAmountUpdatedRequest, $0.ClaimAmountUpdatedResponse>(
+        ($core.List<$core.int> value) => $11.ClaimAssigneesRemovedRequest.fromBuffer(value),
+        ($11.ClaimAssigneesRemovedResponse value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$11.ClaimAmountUpdatedRequest, $11.ClaimAmountUpdatedResponse>(
        'AmountUpdated',
        amountUpdated_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.ClaimAmountUpdatedRequest.fromBuffer(value),
-        ($0.ClaimAmountUpdatedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.ClaimAttachmentAddedRequest, $0.ClaimAttachmentAddedResponse>(
+        ($core.List<$core.int> value) => $11.ClaimAmountUpdatedRequest.fromBuffer(value),
+        ($11.ClaimAmountUpdatedResponse value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$11.ClaimAttachmentAddedRequest, $11.ClaimAttachmentAddedResponse>(
        'AttachmentAdded',
        attachmentAdded_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.ClaimAttachmentAddedRequest.fromBuffer(value),
-        ($0.ClaimAttachmentAddedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.ClaimAttachmentRemovedRequest, $0.ClaimAttachmentRemovedResponse>(
+        ($core.List<$core.int> value) => $11.ClaimAttachmentAddedRequest.fromBuffer(value),
+        ($11.ClaimAttachmentAddedResponse value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$11.ClaimAttachmentRemovedRequest, $11.ClaimAttachmentRemovedResponse>(
        'AttachmentRemoved',
        attachmentRemoved_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.ClaimAttachmentRemovedRequest.fromBuffer(value),
-        ($0.ClaimAttachmentRemovedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.ClaimMetaDataUpdatedRequest, $0.ClaimMetaDataUpdatedResponse>(
+        ($core.List<$core.int> value) => $11.ClaimAttachmentRemovedRequest.fromBuffer(value),
+        ($11.ClaimAttachmentRemovedResponse value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$11.ClaimMetaDataUpdatedRequest, $11.ClaimMetaDataUpdatedResponse>(
        'MetaDataUpdated',
        metaDataUpdated_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.ClaimMetaDataUpdatedRequest.fromBuffer(value),
-        ($0.ClaimMetaDataUpdatedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.ClaimTitleUpdatedRequest, $0.ClaimTitleUpdatedResponse>(
+        ($core.List<$core.int> value) => $11.ClaimMetaDataUpdatedRequest.fromBuffer(value),
+        ($11.ClaimMetaDataUpdatedResponse value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$11.ClaimTitleUpdatedRequest, $11.ClaimTitleUpdatedResponse>(
        'TitleUpdated',
        titleUpdated_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.ClaimTitleUpdatedRequest.fromBuffer(value),
-        ($0.ClaimTitleUpdatedResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.ClaimMessageSentRequest, $0.ClaimMessageSentResponse>(
+        ($core.List<$core.int> value) => $11.ClaimTitleUpdatedRequest.fromBuffer(value),
+        ($11.ClaimTitleUpdatedResponse value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$11.ClaimMessageSentRequest, $11.ClaimMessageSentResponse>(
        'MessageSent',
        messageSent_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.ClaimMessageSentRequest.fromBuffer(value),
-        ($0.ClaimMessageSentResponse value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.ClaimDeletedRequest, $0.ClaimDeletedResponse>(
+        ($core.List<$core.int> value) => $11.ClaimMessageSentRequest.fromBuffer(value),
+        ($11.ClaimMessageSentResponse value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$11.ClaimDeletedRequest, $11.ClaimDeletedResponse>(
        'Deleted',
        deleted_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.ClaimDeletedRequest.fromBuffer(value),
-        ($0.ClaimDeletedResponse value) => value.writeToBuffer()));
+        ($core.List<$core.int> value) => $11.ClaimDeletedRequest.fromBuffer(value),
+        ($11.ClaimDeletedResponse value) => value.writeToBuffer()));
  }

-  $async.Future<$0.ClaimCreatedResponse> created_Pre($grpc.ServiceCall $call, $async.Future<$0.ClaimCreatedRequest> $request) async {
+  $async.Future<$11.ClaimCreatedResponse> created_Pre($grpc.ServiceCall $call, $async.Future<$11.ClaimCreatedRequest> $request) async {
    return created($call, await $request);
  }

-  $async.Future<$0.ClaimCreatedResponse> created($grpc.ServiceCall call, $0.ClaimCreatedRequest request);
-
-  $async.Future<$0.ClaimCompletedResponse> completed_Pre($grpc.ServiceCall $call, $async.Future<$0.ClaimCompletedRequest> $request) async {
+  $async.Future<$11.ClaimCompletedResponse> completed_Pre($grpc.ServiceCall $call, $async.Future<$11.ClaimCompletedRequest> $request) async {
    return completed($call, await $request);
  }

-  $async.Future<$0.ClaimCompletedResponse> completed($grpc.ServiceCall call, $0.ClaimCompletedRequest request);
-
-  $async.Future<$0.ClaimCriticalityUpdatedResponse> criticalityUpdated_Pre($grpc.ServiceCall $call, $async.Future<$0.ClaimCriticalityUpdatedRequest> $request) async {
+  $async.Future<$11.ClaimCriticalityUpdatedResponse> criticalityUpdated_Pre($grpc.ServiceCall $call, $async.Future<$11.ClaimCriticalityUpdatedRequest> $request) async {
    return criticalityUpdated($call, await $request);
  }

-  $async.Future<$0.ClaimCriticalityUpdatedResponse> criticalityUpdated($grpc.ServiceCall call, $0.ClaimCriticalityUpdatedRequest request);
-
-  $async.Future<$0.ClaimStatusUpdatedResponse> statusUpdated_Pre($grpc.ServiceCall $call, $async.Future<$0.ClaimStatusUpdatedRequest> $request) async {
+  $async.Future<$11.ClaimStatusUpdatedResponse> statusUpdated_Pre($grpc.ServiceCall $call, $async.Future<$11.ClaimStatusUpdatedRequest> $request) async {
    return statusUpdated($call, await $request);
  }

-  $async.Future<$0.ClaimStatusUpdatedResponse> statusUpdated($grpc.ServiceCall call, $0.ClaimStatusUpdatedRequest request);
-
-  $async.Future<$0.ClaimAssigneesAddedResponse> assigneesAdded_Pre($grpc.ServiceCall $call, $async.Future<$0.ClaimAssigneesAddedRequest> $request) async {
+  $async.Future<$11.ClaimAssigneesAddedResponse> assigneesAdded_Pre($grpc.ServiceCall $call, $async.Future<$11.ClaimAssigneesAddedRequest> $request) async {
    return assigneesAdded($call, await $request);
  }

-  $async.Future<$0.ClaimAssigneesAddedResponse> assigneesAdded($grpc.ServiceCall call, $0.ClaimAssigneesAddedRequest request);
-
-  $async.Future<$0.ClaimAssigneesRemovedResponse> assigneesRemoved_Pre($grpc.ServiceCall $call, $async.Future<$0.ClaimAssigneesRemovedRequest> $request) async {
+  $async.Future<$11.ClaimAssigneesRemovedResponse> assigneesRemoved_Pre($grpc.ServiceCall $call, $async.Future<$11.ClaimAssigneesRemovedRequest> $request) async {
    return assigneesRemoved($call, await $request);
  }

-  $async.Future<$0.ClaimAssigneesRemovedResponse> assigneesRemoved($grpc.ServiceCall call, $0.ClaimAssigneesRemovedRequest request);
-
-  $async.Future<$0.ClaimAmountUpdatedResponse> amountUpdated_Pre($grpc.ServiceCall $call, $async.Future<$0.ClaimAmountUpdatedRequest> $request) async {
+  $async.Future<$11.ClaimAmountUpdatedResponse> amountUpdated_Pre($grpc.ServiceCall $call, $async.Future<$11.ClaimAmountUpdatedRequest> $request) async {
    return amountUpdated($call, await $request);
  }

-  $async.Future<$0.ClaimAmountUpdatedResponse> amountUpdated($grpc.ServiceCall call, $0.ClaimAmountUpdatedRequest request);
-
-  $async.Future<$0.ClaimAttachmentAddedResponse> attachmentAdded_Pre($grpc.ServiceCall $call, $async.Future<$0.ClaimAttachmentAddedRequest> $request) async {
+  $async.Future<$11.ClaimAttachmentAddedResponse> attachmentAdded_Pre($grpc.ServiceCall $call, $async.Future<$11.ClaimAttachmentAddedRequest> $request) async {
    return attachmentAdded($call, await $request);
  }

-  $async.Future<$0.ClaimAttachmentAddedResponse> attachmentAdded($grpc.ServiceCall call, $0.ClaimAttachmentAddedRequest request);
-
-  $async.Future<$0.ClaimAttachmentRemovedResponse> attachmentRemoved_Pre($grpc.ServiceCall $call, $async.Future<$0.ClaimAttachmentRemovedRequest> $request) async {
+  $async.Future<$11.ClaimAttachmentRemovedResponse> attachmentRemoved_Pre($grpc.ServiceCall $call, $async.Future<$11.ClaimAttachmentRemovedRequest> $request) async {
    return attachmentRemoved($call, await $request);
  }

-  $async.Future<$0.ClaimAttachmentRemovedResponse> attachmentRemoved($grpc.ServiceCall call, $0.ClaimAttachmentRemovedRequest request);
-
-  $async.Future<$0.ClaimMetaDataUpdatedResponse> metaDataUpdated_Pre($grpc.ServiceCall $call, $async.Future<$0.ClaimMetaDataUpdatedRequest> $request) async {
+  $async.Future<$11.ClaimMetaDataUpdatedResponse> metaDataUpdated_Pre($grpc.ServiceCall $call, $async.Future<$11.ClaimMetaDataUpdatedRequest> $request) async {
    return metaDataUpdated($call, await $request);
  }

-  $async.Future<$0.ClaimMetaDataUpdatedResponse> metaDataUpdated($grpc.ServiceCall call, $0.ClaimMetaDataUpdatedRequest request);
-
-  $async.Future<$0.ClaimTitleUpdatedResponse> titleUpdated_Pre($grpc.ServiceCall $call, $async.Future<$0.ClaimTitleUpdatedRequest> $request) async {
+  $async.Future<$11.ClaimTitleUpdatedResponse> titleUpdated_Pre($grpc.ServiceCall $call, $async.Future<$11.ClaimTitleUpdatedRequest> $request) async {
    return titleUpdated($call, await $request);
  }

-  $async.Future<$0.ClaimTitleUpdatedResponse> titleUpdated($grpc.ServiceCall call, $0.ClaimTitleUpdatedRequest request);
-
-  $async.Future<$0.ClaimMessageSentResponse> messageSent_Pre($grpc.ServiceCall $call, $async.Future<$0.ClaimMessageSentRequest> $request) async {
+  $async.Future<$11.ClaimMessageSentResponse> messageSent_Pre($grpc.ServiceCall $call, $async.Future<$11.ClaimMessageSentRequest> $request) async {
    return messageSent($call, await $request);
  }

-  $async.Future<$0.ClaimMessageSentResponse> messageSent($grpc.ServiceCall call, $0.ClaimMessageSentRequest request);
-
-  $async.Future<$0.ClaimDeletedResponse> deleted_Pre($grpc.ServiceCall $call, $async.Future<$0.ClaimDeletedRequest> $request) async {
+  $async.Future<$11.ClaimDeletedResponse> deleted_Pre($grpc.ServiceCall $call, $async.Future<$11.ClaimDeletedRequest> $request) async {
    return deleted($call, await $request);
  }

-  $async.Future<$0.ClaimDeletedResponse> deleted($grpc.ServiceCall call, $0.ClaimDeletedRequest request);
-
+  $async.Future<$11.ClaimCreatedResponse> created($grpc.ServiceCall call, $11.ClaimCreatedRequest request);
+  $async.Future<$11.ClaimCompletedResponse> completed($grpc.ServiceCall call, $11.ClaimCompletedRequest request);
+  $async.Future<$11.ClaimCriticalityUpdatedResponse> criticalityUpdated($grpc.ServiceCall call, $11.ClaimCriticalityUpdatedRequest request);
+  $async.Future<$11.ClaimStatusUpdatedResponse> statusUpdated($grpc.ServiceCall call, $11.ClaimStatusUpdatedRequest request);
+  $async.Future<$11.ClaimAssigneesAddedResponse> assigneesAdded($grpc.ServiceCall call, $11.ClaimAssigneesAddedRequest request);
+  $async.Future<$11.ClaimAssigneesRemovedResponse> assigneesRemoved($grpc.ServiceCall call, $11.ClaimAssigneesRemovedRequest request);
+  $async.Future<$11.ClaimAmountUpdatedResponse> amountUpdated($grpc.ServiceCall call, $11.ClaimAmountUpdatedRequest request);
+  $async.Future<$11.ClaimAttachmentAddedResponse> attachmentAdded($grpc.ServiceCall call, $11.ClaimAttachmentAddedRequest request);
+  $async.Future<$11.ClaimAttachmentRemovedResponse> attachmentRemoved($grpc.ServiceCall call, $11.ClaimAttachmentRemovedRequest request);
+  $async.Future<$11.ClaimMetaDataUpdatedResponse> metaDataUpdated($grpc.ServiceCall call, $11.ClaimMetaDataUpdatedRequest request);
+  $async.Future<$11.ClaimTitleUpdatedResponse> titleUpdated($grpc.ServiceCall call, $11.ClaimTitleUpdatedRequest request);
+  $async.Future<$11.ClaimMessageSentResponse> messageSent($grpc.ServiceCall call, $11.ClaimMessageSentRequest request);
+  $async.Future<$11.ClaimDeletedResponse> deleted($grpc.ServiceCall call, $11.ClaimDeletedRequest request);
 }
--- a/lib/claimInput.pbjson.dart
+++ b/lib/claimInput.pbjson.dart
@@ -1,14 +1,13 @@
-// This is a generated file - do not edit.
 //
-// Generated from claimInput.proto.
-
+//  Generated code. Do not modify.
+//  source: claimInput.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
--- a/lib/claimQuery.pb.dart
+++ b/lib/claimQuery.pb.dart
@@ -1,61 +1,63 @@
-// This is a generated file - do not edit.
 //
-// Generated from claimQuery.proto.
-
+//  Generated code. Do not modify.
+//  source: claimQuery.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:core' as $core;

 import 'package:protobuf/protobuf.dart' as $pb;

-import 'claim.pb.dart' as $3;
-import 'shared.pb.dart' as $1;
-import 'user.pb.dart' as $4;
+import 'claim.pb.dart' as $71;
+import 'shared.pb.dart' as $3;
+import 'user.pb.dart' as $60;

 export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;

 class ClaimByIdQuery extends $pb.GeneratedMessage {
  factory ClaimByIdQuery({
-    $1.QueryProjectHeader? header,
-    $core.Iterable<$1.EntityID>? iDs,
-    ClaimQueryOptions? options,
+    $3.QueryProjectHeader? header,
+    $core.Iterable<$3.EntityID>? iDs,
  }) {
-    final result = create();
-    if (header != null) result.header = header;
-    if (iDs != null) result.iDs.addAll(iDs);
-    if (options != null) result.options = options;
-    return result;
+    final $result = create();
+    if (header != null) {
+      $result.header = header;
+    }
+    if (iDs != null) {
+      $result.iDs.addAll(iDs);
+    }
+    return $result;
  }
-
-  ClaimByIdQuery._();
-
-  factory ClaimByIdQuery.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory ClaimByIdQuery.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  ClaimByIdQuery._() : super();
+  factory ClaimByIdQuery.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory ClaimByIdQuery.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ClaimByIdQuery', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$1.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.QueryProjectHeader.create)
-    ..pc<$1.EntityID>(2, _omitFieldNames ? '' : 'IDs', $pb.PbFieldType.PM, protoName: 'IDs', subBuilder: $1.EntityID.create)
-    ..aOM<ClaimQueryOptions>(3, _omitFieldNames ? '' : 'Options', protoName: 'Options', subBuilder: ClaimQueryOptions.create)
+    ..aOM<$3.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.QueryProjectHeader.create)
+    ..pc<$3.EntityID>(2, _omitFieldNames ? '' : 'IDs', $pb.PbFieldType.PM, protoName: 'IDs', subBuilder: $3.EntityID.create)
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  ClaimByIdQuery clone() => ClaimByIdQuery()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  ClaimByIdQuery copyWith(void Function(ClaimByIdQuery) updates) => super.copyWith((message) => updates(message as ClaimByIdQuery)) as ClaimByIdQuery;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static ClaimByIdQuery create() => ClaimByIdQuery._();
-  @$core.override
  ClaimByIdQuery createEmptyInstance() => create();
  static $pb.PbList<ClaimByIdQuery> createRepeated() => $pb.PbList<ClaimByIdQuery>();
  @$core.pragma('dart2js:noInline')
@@ -63,64 +65,59 @@ class ClaimByIdQuery extends $pb.GeneratedMessage {
  static ClaimByIdQuery? _defaultInstance;

  @$pb.TagNumber(1)
-  $1.QueryProjectHeader get header => $_getN(0);
+  $3.QueryProjectHeader get header => $_getN(0);
  @$pb.TagNumber(1)
-  set header($1.QueryProjectHeader value) => $_setField(1, value);
+  set header($3.QueryProjectHeader v) { $_setField(1, v); }
  @$pb.TagNumber(1)
  $core.bool hasHeader() => $_has(0);
  @$pb.TagNumber(1)
  void clearHeader() => $_clearField(1);
  @$pb.TagNumber(1)
-  $1.QueryProjectHeader ensureHeader() => $_ensure(0);
+  $3.QueryProjectHeader ensureHeader() => $_ensure(0);

  @$pb.TagNumber(2)
-  $pb.PbList<$1.EntityID> get iDs => $_getList(1);
-
-  @$pb.TagNumber(3)
-  ClaimQueryOptions get options => $_getN(2);
-  @$pb.TagNumber(3)
-  set options(ClaimQueryOptions value) => $_setField(3, value);
-  @$pb.TagNumber(3)
-  $core.bool hasOptions() => $_has(2);
-  @$pb.TagNumber(3)
-  void clearOptions() => $_clearField(3);
-  @$pb.TagNumber(3)
-  ClaimQueryOptions ensureOptions() => $_ensure(2);
+  $pb.PbList<$3.EntityID> get iDs => $_getList(1);
 }

 class ClaimByIdResult extends $pb.GeneratedMessage {
  factory ClaimByIdResult({
-    $1.ResultHeader? header,
-    $core.Iterable<$3.Claim>? objects,
+    $3.ResultHeader? header,
+    $core.Iterable<$71.Claim>? objects,
  }) {
-    final result = create();
-    if (header != null) result.header = header;
-    if (objects != null) result.objects.addAll(objects);
-    return result;
+    final $result = create();
+    if (header != null) {
+      $result.header = header;
+    }
+    if (objects != null) {
+      $result.objects.addAll(objects);
+    }
+    return $result;
  }
-
-  ClaimByIdResult._();
-
-  factory ClaimByIdResult.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory ClaimByIdResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  ClaimByIdResult._() : super();
+  factory ClaimByIdResult.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory ClaimByIdResult.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ClaimByIdResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$1.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.ResultHeader.create)
-    ..pc<$3.Claim>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $3.Claim.create)
+    ..aOM<$3.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.ResultHeader.create)
+    ..pc<$71.Claim>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $71.Claim.create)
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  ClaimByIdResult clone() => ClaimByIdResult()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  ClaimByIdResult copyWith(void Function(ClaimByIdResult) updates) => super.copyWith((message) => updates(message as ClaimByIdResult)) as ClaimByIdResult;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static ClaimByIdResult create() => ClaimByIdResult._();
-  @$core.override
  ClaimByIdResult createEmptyInstance() => create();
  static $pb.PbList<ClaimByIdResult> createRepeated() => $pb.PbList<ClaimByIdResult>();
  @$core.pragma('dart2js:noInline')
@@ -128,62 +125,69 @@ class ClaimByIdResult extends $pb.GeneratedMessage {
  static ClaimByIdResult? _defaultInstance;

  @$pb.TagNumber(1)
-  $1.ResultHeader get header => $_getN(0);
+  $3.ResultHeader get header => $_getN(0);
  @$pb.TagNumber(1)
-  set header($1.ResultHeader value) => $_setField(1, value);
+  set header($3.ResultHeader v) { $_setField(1, v); }
  @$pb.TagNumber(1)
  $core.bool hasHeader() => $_has(0);
  @$pb.TagNumber(1)
  void clearHeader() => $_clearField(1);
  @$pb.TagNumber(1)
-  $1.ResultHeader ensureHeader() => $_ensure(0);
+  $3.ResultHeader ensureHeader() => $_ensure(0);

  @$pb.TagNumber(2)
-  $pb.PbList<$3.Claim> get objects => $_getList(1);
+  $pb.PbList<$71.Claim> get objects => $_getList(1);
 }

 class ClaimByFilterQuery extends $pb.GeneratedMessage {
  factory ClaimByFilterQuery({
-    $1.QueryProjectHeader? header,
+    $3.QueryProjectHeader? header,
    $core.String? limitFilter,
    $core.String? queryContext,
-    $core.Iterable<$1.BlockFilter>? blockFilters,
-    ClaimQueryOptions? options,
+    $core.Iterable<$3.BlockFilter>? blockFilters,
  }) {
-    final result = create();
-    if (header != null) result.header = header;
-    if (limitFilter != null) result.limitFilter = limitFilter;
-    if (queryContext != null) result.queryContext = queryContext;
-    if (blockFilters != null) result.blockFilters.addAll(blockFilters);
-    if (options != null) result.options = options;
-    return result;
+    final $result = create();
+    if (header != null) {
+      $result.header = header;
+    }
+    if (limitFilter != null) {
+      $result.limitFilter = limitFilter;
+    }
+    if (queryContext != null) {
+      $result.queryContext = queryContext;
+    }
+    if (blockFilters != null) {
+      $result.blockFilters.addAll(blockFilters);
+    }
+    return $result;
  }
-
-  ClaimByFilterQuery._();
-
-  factory ClaimByFilterQuery.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory ClaimByFilterQuery.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  ClaimByFilterQuery._() : super();
+  factory ClaimByFilterQuery.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory ClaimByFilterQuery.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ClaimByFilterQuery', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$1.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.QueryProjectHeader.create)
+    ..aOM<$3.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.QueryProjectHeader.create)
    ..aOS(4, _omitFieldNames ? '' : 'limitFilter', protoName: 'limitFilter')
    ..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)
+    ..pc<$3.BlockFilter>(6, _omitFieldNames ? '' : 'BlockFilters', $pb.PbFieldType.PM, protoName: 'BlockFilters', subBuilder: $3.BlockFilter.create)
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  ClaimByFilterQuery clone() => ClaimByFilterQuery()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  ClaimByFilterQuery copyWith(void Function(ClaimByFilterQuery) updates) => super.copyWith((message) => updates(message as ClaimByFilterQuery)) as ClaimByFilterQuery;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static ClaimByFilterQuery create() => ClaimByFilterQuery._();
-  @$core.override
  ClaimByFilterQuery createEmptyInstance() => create();
  static $pb.PbList<ClaimByFilterQuery> createRepeated() => $pb.PbList<ClaimByFilterQuery>();
  @$core.pragma('dart2js:noInline')
@@ -191,21 +195,21 @@ class ClaimByFilterQuery extends $pb.GeneratedMessage {
  static ClaimByFilterQuery? _defaultInstance;

  @$pb.TagNumber(1)
-  $1.QueryProjectHeader get header => $_getN(0);
+  $3.QueryProjectHeader get header => $_getN(0);
  @$pb.TagNumber(1)
-  set header($1.QueryProjectHeader value) => $_setField(1, value);
+  set header($3.QueryProjectHeader v) { $_setField(1, v); }
  @$pb.TagNumber(1)
  $core.bool hasHeader() => $_has(0);
  @$pb.TagNumber(1)
  void clearHeader() => $_clearField(1);
  @$pb.TagNumber(1)
-  $1.QueryProjectHeader ensureHeader() => $_ensure(0);
+  $3.QueryProjectHeader ensureHeader() => $_ensure(0);

  /// Number of maximum result
  @$pb.TagNumber(4)
  $core.String get limitFilter => $_getSZ(1);
  @$pb.TagNumber(4)
-  set limitFilter($core.String value) => $_setString(1, value);
+  set limitFilter($core.String v) { $_setString(1, v); }
  @$pb.TagNumber(4)
  $core.bool hasLimitFilter() => $_has(1);
  @$pb.TagNumber(4)
@@ -214,7 +218,7 @@ class ClaimByFilterQuery extends $pb.GeneratedMessage {
  @$pb.TagNumber(5)
  $core.String get queryContext => $_getSZ(2);
  @$pb.TagNumber(5)
-  set queryContext($core.String value) => $_setString(2, value);
+  set queryContext($core.String v) { $_setString(2, v); }
  @$pb.TagNumber(5)
  $core.bool hasQueryContext() => $_has(2);
  @$pb.TagNumber(5)
@@ -222,56 +226,53 @@ class ClaimByFilterQuery extends $pb.GeneratedMessage {

  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query, if not empty, simpleFilters (deprecated) & rangeFilters (deprecated) will be ignored
  @$pb.TagNumber(6)
-  $pb.PbList<$1.BlockFilter> get blockFilters => $_getList(3);
-
-  @$pb.TagNumber(7)
-  ClaimQueryOptions get options => $_getN(4);
-  @$pb.TagNumber(7)
-  set options(ClaimQueryOptions value) => $_setField(7, value);
-  @$pb.TagNumber(7)
-  $core.bool hasOptions() => $_has(4);
-  @$pb.TagNumber(7)
-  void clearOptions() => $_clearField(7);
-  @$pb.TagNumber(7)
-  ClaimQueryOptions ensureOptions() => $_ensure(4);
+  $pb.PbList<$3.BlockFilter> get blockFilters => $_getList(3);
 }

 class ClaimByFilterResult extends $pb.GeneratedMessage {
  factory ClaimByFilterResult({
-    $1.ResultHeader? header,
-    $core.Iterable<$3.Claim>? objects,
+    $3.ResultHeader? header,
+    $core.Iterable<$71.Claim>? objects,
    $core.String? queryContext,
  }) {
-    final result = create();
-    if (header != null) result.header = header;
-    if (objects != null) result.objects.addAll(objects);
-    if (queryContext != null) result.queryContext = queryContext;
-    return result;
+    final $result = create();
+    if (header != null) {
+      $result.header = header;
+    }
+    if (objects != null) {
+      $result.objects.addAll(objects);
+    }
+    if (queryContext != null) {
+      $result.queryContext = queryContext;
+    }
+    return $result;
  }
-
-  ClaimByFilterResult._();
-
-  factory ClaimByFilterResult.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory ClaimByFilterResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  ClaimByFilterResult._() : super();
+  factory ClaimByFilterResult.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory ClaimByFilterResult.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ClaimByFilterResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$1.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.ResultHeader.create)
-    ..pc<$3.Claim>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $3.Claim.create)
+    ..aOM<$3.ResultHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.ResultHeader.create)
+    ..pc<$71.Claim>(2, _omitFieldNames ? '' : 'Objects', $pb.PbFieldType.PM, protoName: 'Objects', subBuilder: $71.Claim.create)
    ..aOS(3, _omitFieldNames ? '' : 'queryContext', protoName: 'queryContext')
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  ClaimByFilterResult clone() => ClaimByFilterResult()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  ClaimByFilterResult copyWith(void Function(ClaimByFilterResult) updates) => super.copyWith((message) => updates(message as ClaimByFilterResult)) as ClaimByFilterResult;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static ClaimByFilterResult create() => ClaimByFilterResult._();
-  @$core.override
  ClaimByFilterResult createEmptyInstance() => create();
  static $pb.PbList<ClaimByFilterResult> createRepeated() => $pb.PbList<ClaimByFilterResult>();
  @$core.pragma('dart2js:noInline')
@@ -279,95 +280,73 @@ class ClaimByFilterResult extends $pb.GeneratedMessage {
  static ClaimByFilterResult? _defaultInstance;

  @$pb.TagNumber(1)
-  $1.ResultHeader get header => $_getN(0);
+  $3.ResultHeader get header => $_getN(0);
  @$pb.TagNumber(1)
-  set header($1.ResultHeader value) => $_setField(1, value);
+  set header($3.ResultHeader v) { $_setField(1, v); }
  @$pb.TagNumber(1)
  $core.bool hasHeader() => $_has(0);
  @$pb.TagNumber(1)
  void clearHeader() => $_clearField(1);
  @$pb.TagNumber(1)
-  $1.ResultHeader ensureHeader() => $_ensure(0);
+  $3.ResultHeader ensureHeader() => $_ensure(0);

  @$pb.TagNumber(2)
-  $pb.PbList<$3.Claim> get objects => $_getList(1);
+  $pb.PbList<$71.Claim> get objects => $_getList(1);

  @$pb.TagNumber(3)
  $core.String get queryContext => $_getSZ(2);
  @$pb.TagNumber(3)
-  set queryContext($core.String value) => $_setString(2, value);
+  set queryContext($core.String v) { $_setString(2, v); }
  @$pb.TagNumber(3)
  $core.bool hasQueryContext() => $_has(2);
  @$pb.TagNumber(3)
  void clearQueryContext() => $_clearField(3);
 }

-class ClaimQueryOptions extends $pb.GeneratedMessage {
-  factory ClaimQueryOptions() => create();
-
-  ClaimQueryOptions._();
-
-  factory ClaimQueryOptions.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory ClaimQueryOptions.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ClaimQueryOptions', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ClaimQueryOptions clone() => ClaimQueryOptions()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ClaimQueryOptions copyWith(void Function(ClaimQueryOptions) updates) => super.copyWith((message) => updates(message as ClaimQueryOptions)) as ClaimQueryOptions;
-
-  @$core.override
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static ClaimQueryOptions create() => ClaimQueryOptions._();
-  @$core.override
-  ClaimQueryOptions createEmptyInstance() => create();
-  static $pb.PbList<ClaimQueryOptions> createRepeated() => $pb.PbList<ClaimQueryOptions>();
-  @$core.pragma('dart2js:noInline')
-  static ClaimQueryOptions getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<ClaimQueryOptions>(create);
-  static ClaimQueryOptions? _defaultInstance;
-}
-
 class ClaimByMatchQuery extends $pb.GeneratedMessage {
  factory ClaimByMatchQuery({
-    $1.QueryProjectHeader? header,
-    $core.Iterable<$1.BlockFilter>? blockFilters,
-    $core.Iterable<$1.MatchField>? matchFields,
+    $3.QueryProjectHeader? header,
+    $core.Iterable<$3.BlockFilter>? blockFilters,
+    $core.Iterable<$3.MatchField>? matchFields,
  }) {
-    final result = create();
-    if (header != null) result.header = header;
-    if (blockFilters != null) result.blockFilters.addAll(blockFilters);
-    if (matchFields != null) result.matchFields.addAll(matchFields);
-    return result;
+    final $result = create();
+    if (header != null) {
+      $result.header = header;
+    }
+    if (blockFilters != null) {
+      $result.blockFilters.addAll(blockFilters);
+    }
+    if (matchFields != null) {
+      $result.matchFields.addAll(matchFields);
+    }
+    return $result;
  }
-
-  ClaimByMatchQuery._();
-
-  factory ClaimByMatchQuery.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory ClaimByMatchQuery.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  ClaimByMatchQuery._() : super();
+  factory ClaimByMatchQuery.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory ClaimByMatchQuery.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ClaimByMatchQuery', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$1.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.QueryProjectHeader.create)
-    ..pc<$1.BlockFilter>(5, _omitFieldNames ? '' : 'BlockFilters', $pb.PbFieldType.PM, protoName: 'BlockFilters', subBuilder: $1.BlockFilter.create)
-    ..pc<$1.MatchField>(6, _omitFieldNames ? '' : 'MatchFields', $pb.PbFieldType.PM, protoName: 'MatchFields', subBuilder: $1.MatchField.create)
+    ..aOM<$3.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.QueryProjectHeader.create)
+    ..pc<$3.BlockFilter>(5, _omitFieldNames ? '' : 'BlockFilters', $pb.PbFieldType.PM, protoName: 'BlockFilters', subBuilder: $3.BlockFilter.create)
+    ..pc<$3.MatchField>(6, _omitFieldNames ? '' : 'MatchFields', $pb.PbFieldType.PM, protoName: 'MatchFields', subBuilder: $3.MatchField.create)
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  ClaimByMatchQuery clone() => ClaimByMatchQuery()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  ClaimByMatchQuery copyWith(void Function(ClaimByMatchQuery) updates) => super.copyWith((message) => updates(message as ClaimByMatchQuery)) as ClaimByMatchQuery;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static ClaimByMatchQuery create() => ClaimByMatchQuery._();
-  @$core.override
  ClaimByMatchQuery createEmptyInstance() => create();
  static $pb.PbList<ClaimByMatchQuery> createRepeated() => $pb.PbList<ClaimByMatchQuery>();
  @$core.pragma('dart2js:noInline')
@@ -375,55 +354,59 @@ class ClaimByMatchQuery extends $pb.GeneratedMessage {
  static ClaimByMatchQuery? _defaultInstance;

  @$pb.TagNumber(1)
-  $1.QueryProjectHeader get header => $_getN(0);
+  $3.QueryProjectHeader get header => $_getN(0);
  @$pb.TagNumber(1)
-  set header($1.QueryProjectHeader value) => $_setField(1, value);
+  set header($3.QueryProjectHeader v) { $_setField(1, v); }
  @$pb.TagNumber(1)
  $core.bool hasHeader() => $_has(0);
  @$pb.TagNumber(1)
  void clearHeader() => $_clearField(1);
  @$pb.TagNumber(1)
-  $1.QueryProjectHeader ensureHeader() => $_ensure(0);
+  $3.QueryProjectHeader ensureHeader() => $_ensure(0);

  /// list of blockFilters structure for Find query, each element (BlockFilter) in the list is an "OR" part of the query, if not empty, simpleFilters (deprecated) & rangeFilters (deprecated) will be ignored
  @$pb.TagNumber(5)
-  $pb.PbList<$1.BlockFilter> get blockFilters => $_getList(1);
+  $pb.PbList<$3.BlockFilter> get blockFilters => $_getList(1);

  /// MatchField list structure, for FindMatching query
  @$pb.TagNumber(6)
-  $pb.PbList<$1.MatchField> get matchFields => $_getList(2);
+  $pb.PbList<$3.MatchField> get matchFields => $_getList(2);
 }

 class ClaimByMatchResult extends $pb.GeneratedMessage {
  factory ClaimByMatchResult({
-    $core.Iterable<$1.MatchFieldResult>? matchResults,
+    $core.Iterable<$3.MatchFieldResult>? matchResults,
  }) {
-    final result = create();
-    if (matchResults != null) result.matchResults.addAll(matchResults);
-    return result;
+    final $result = create();
+    if (matchResults != null) {
+      $result.matchResults.addAll(matchResults);
+    }
+    return $result;
  }
-
-  ClaimByMatchResult._();
-
-  factory ClaimByMatchResult.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory ClaimByMatchResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  ClaimByMatchResult._() : super();
+  factory ClaimByMatchResult.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory ClaimByMatchResult.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ClaimByMatchResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..pc<$1.MatchFieldResult>(2, _omitFieldNames ? '' : 'MatchResults', $pb.PbFieldType.PM, protoName: 'MatchResults', subBuilder: $1.MatchFieldResult.create)
+    ..pc<$3.MatchFieldResult>(2, _omitFieldNames ? '' : 'MatchResults', $pb.PbFieldType.PM, protoName: 'MatchResults', subBuilder: $3.MatchFieldResult.create)
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  ClaimByMatchResult clone() => ClaimByMatchResult()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  ClaimByMatchResult copyWith(void Function(ClaimByMatchResult) updates) => super.copyWith((message) => updates(message as ClaimByMatchResult)) as ClaimByMatchResult;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static ClaimByMatchResult create() => ClaimByMatchResult._();
-  @$core.override
  ClaimByMatchResult createEmptyInstance() => create();
  static $pb.PbList<ClaimByMatchResult> createRepeated() => $pb.PbList<ClaimByMatchResult>();
  @$core.pragma('dart2js:noInline')
@@ -431,42 +414,48 @@ class ClaimByMatchResult extends $pb.GeneratedMessage {
  static ClaimByMatchResult? _defaultInstance;

  @$pb.TagNumber(2)
-  $pb.PbList<$1.MatchFieldResult> get matchResults => $_getList(0);
+  $pb.PbList<$3.MatchFieldResult> get matchResults => $_getList(0);
 }

 class ClaimGetRoomQuery extends $pb.GeneratedMessage {
  factory ClaimGetRoomQuery({
-    $1.QueryProjectHeader? header,
-    $1.EntityID? iD,
+    $3.QueryProjectHeader? header,
+    $3.EntityID? iD,
  }) {
-    final result = create();
-    if (header != null) result.header = header;
-    if (iD != null) result.iD = iD;
-    return result;
+    final $result = create();
+    if (header != null) {
+      $result.header = header;
+    }
+    if (iD != null) {
+      $result.iD = iD;
+    }
+    return $result;
  }
-
-  ClaimGetRoomQuery._();
-
-  factory ClaimGetRoomQuery.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory ClaimGetRoomQuery.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  ClaimGetRoomQuery._() : super();
+  factory ClaimGetRoomQuery.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory ClaimGetRoomQuery.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ClaimGetRoomQuery', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$1.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.QueryProjectHeader.create)
-    ..aOM<$1.EntityID>(2, _omitFieldNames ? '' : 'ID', protoName: 'ID', subBuilder: $1.EntityID.create)
+    ..aOM<$3.QueryProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.QueryProjectHeader.create)
+    ..aOM<$3.EntityID>(2, _omitFieldNames ? '' : 'ID', protoName: 'ID', subBuilder: $3.EntityID.create)
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  ClaimGetRoomQuery clone() => ClaimGetRoomQuery()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  ClaimGetRoomQuery copyWith(void Function(ClaimGetRoomQuery) updates) => super.copyWith((message) => updates(message as ClaimGetRoomQuery)) as ClaimGetRoomQuery;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static ClaimGetRoomQuery create() => ClaimGetRoomQuery._();
-  @$core.override
  ClaimGetRoomQuery createEmptyInstance() => create();
  static $pb.PbList<ClaimGetRoomQuery> createRepeated() => $pb.PbList<ClaimGetRoomQuery>();
  @$core.pragma('dart2js:noInline')
@@ -474,58 +463,62 @@ class ClaimGetRoomQuery extends $pb.GeneratedMessage {
  static ClaimGetRoomQuery? _defaultInstance;

  @$pb.TagNumber(1)
-  $1.QueryProjectHeader get header => $_getN(0);
+  $3.QueryProjectHeader get header => $_getN(0);
  @$pb.TagNumber(1)
-  set header($1.QueryProjectHeader value) => $_setField(1, value);
+  set header($3.QueryProjectHeader v) { $_setField(1, v); }
  @$pb.TagNumber(1)
  $core.bool hasHeader() => $_has(0);
  @$pb.TagNumber(1)
  void clearHeader() => $_clearField(1);
  @$pb.TagNumber(1)
-  $1.QueryProjectHeader ensureHeader() => $_ensure(0);
+  $3.QueryProjectHeader ensureHeader() => $_ensure(0);

  @$pb.TagNumber(2)
-  $1.EntityID get iD => $_getN(1);
+  $3.EntityID get iD => $_getN(1);
  @$pb.TagNumber(2)
-  set iD($1.EntityID value) => $_setField(2, value);
+  set iD($3.EntityID v) { $_setField(2, v); }
  @$pb.TagNumber(2)
  $core.bool hasID() => $_has(1);
  @$pb.TagNumber(2)
  void clearID() => $_clearField(2);
  @$pb.TagNumber(2)
-  $1.EntityID ensureID() => $_ensure(1);
+  $3.EntityID ensureID() => $_ensure(1);
 }

 class ClaimGetRoomResult extends $pb.GeneratedMessage {
  factory ClaimGetRoomResult({
    $core.String? roomName,
  }) {
-    final result = create();
-    if (roomName != null) result.roomName = roomName;
-    return result;
+    final $result = create();
+    if (roomName != null) {
+      $result.roomName = roomName;
+    }
+    return $result;
  }
-
-  ClaimGetRoomResult._();
-
-  factory ClaimGetRoomResult.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory ClaimGetRoomResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  ClaimGetRoomResult._() : super();
+  factory ClaimGetRoomResult.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory ClaimGetRoomResult.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ClaimGetRoomResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
    ..aOS(1, _omitFieldNames ? '' : 'RoomName', protoName: 'RoomName')
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  ClaimGetRoomResult clone() => ClaimGetRoomResult()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  ClaimGetRoomResult copyWith(void Function(ClaimGetRoomResult) updates) => super.copyWith((message) => updates(message as ClaimGetRoomResult)) as ClaimGetRoomResult;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static ClaimGetRoomResult create() => ClaimGetRoomResult._();
-  @$core.override
  ClaimGetRoomResult createEmptyInstance() => create();
  static $pb.PbList<ClaimGetRoomResult> createRepeated() => $pb.PbList<ClaimGetRoomResult>();
  @$core.pragma('dart2js:noInline')
@@ -535,7 +528,7 @@ class ClaimGetRoomResult extends $pb.GeneratedMessage {
  @$pb.TagNumber(1)
  $core.String get roomName => $_getSZ(0);
  @$pb.TagNumber(1)
-  set roomName($core.String value) => $_setString(0, value);
+  set roomName($core.String v) { $_setString(0, v); }
  @$pb.TagNumber(1)
  $core.bool hasRoomName() => $_has(0);
  @$pb.TagNumber(1)
@@ -544,40 +537,48 @@ class ClaimGetRoomResult extends $pb.GeneratedMessage {

 class ClaimGetAvailableContactsQuery extends $pb.GeneratedMessage {
  factory ClaimGetAvailableContactsQuery({
-    $1.RequestProjectHeader? header,
-    $1.EntityID? iD,
+    $3.RequestProjectHeader? header,
+    $3.EntityID? iD,
    $core.Iterable<$core.String>? partnerIDs,
  }) {
-    final result = create();
-    if (header != null) result.header = header;
-    if (iD != null) result.iD = iD;
-    if (partnerIDs != null) result.partnerIDs.addAll(partnerIDs);
-    return result;
+    final $result = create();
+    if (header != null) {
+      $result.header = header;
+    }
+    if (iD != null) {
+      $result.iD = iD;
+    }
+    if (partnerIDs != null) {
+      $result.partnerIDs.addAll(partnerIDs);
+    }
+    return $result;
  }
-
-  ClaimGetAvailableContactsQuery._();
-
-  factory ClaimGetAvailableContactsQuery.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory ClaimGetAvailableContactsQuery.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  ClaimGetAvailableContactsQuery._() : super();
+  factory ClaimGetAvailableContactsQuery.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory ClaimGetAvailableContactsQuery.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ClaimGetAvailableContactsQuery', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$1.RequestProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.RequestProjectHeader.create)
-    ..aOM<$1.EntityID>(2, _omitFieldNames ? '' : 'ID', protoName: 'ID', subBuilder: $1.EntityID.create)
+    ..aOM<$3.RequestProjectHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.RequestProjectHeader.create)
+    ..aOM<$3.EntityID>(2, _omitFieldNames ? '' : 'ID', protoName: 'ID', subBuilder: $3.EntityID.create)
    ..pPS(3, _omitFieldNames ? '' : 'PartnerIDs', protoName: 'PartnerIDs')
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  ClaimGetAvailableContactsQuery clone() => ClaimGetAvailableContactsQuery()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  ClaimGetAvailableContactsQuery copyWith(void Function(ClaimGetAvailableContactsQuery) updates) => super.copyWith((message) => updates(message as ClaimGetAvailableContactsQuery)) as ClaimGetAvailableContactsQuery;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static ClaimGetAvailableContactsQuery create() => ClaimGetAvailableContactsQuery._();
-  @$core.override
  ClaimGetAvailableContactsQuery createEmptyInstance() => create();
  static $pb.PbList<ClaimGetAvailableContactsQuery> createRepeated() => $pb.PbList<ClaimGetAvailableContactsQuery>();
  @$core.pragma('dart2js:noInline')
@@ -585,26 +586,26 @@ class ClaimGetAvailableContactsQuery extends $pb.GeneratedMessage {
  static ClaimGetAvailableContactsQuery? _defaultInstance;

  @$pb.TagNumber(1)
-  $1.RequestProjectHeader get header => $_getN(0);
+  $3.RequestProjectHeader get header => $_getN(0);
  @$pb.TagNumber(1)
-  set header($1.RequestProjectHeader value) => $_setField(1, value);
+  set header($3.RequestProjectHeader v) { $_setField(1, v); }
  @$pb.TagNumber(1)
  $core.bool hasHeader() => $_has(0);
  @$pb.TagNumber(1)
  void clearHeader() => $_clearField(1);
  @$pb.TagNumber(1)
-  $1.RequestProjectHeader ensureHeader() => $_ensure(0);
+  $3.RequestProjectHeader ensureHeader() => $_ensure(0);

  @$pb.TagNumber(2)
-  $1.EntityID get iD => $_getN(1);
+  $3.EntityID get iD => $_getN(1);
  @$pb.TagNumber(2)
-  set iD($1.EntityID value) => $_setField(2, value);
+  set iD($3.EntityID v) { $_setField(2, v); }
  @$pb.TagNumber(2)
  $core.bool hasID() => $_has(1);
  @$pb.TagNumber(2)
  void clearID() => $_clearField(2);
  @$pb.TagNumber(2)
-  $1.EntityID ensureID() => $_ensure(1);
+  $3.EntityID ensureID() => $_ensure(1);

  @$pb.TagNumber(3)
  $pb.PbList<$core.String> get partnerIDs => $_getList(2);
@@ -612,34 +613,38 @@ class ClaimGetAvailableContactsQuery extends $pb.GeneratedMessage {

 class ClaimGetAvailableContactsResult extends $pb.GeneratedMessage {
  factory ClaimGetAvailableContactsResult({
-    $core.Iterable<$4.User>? contacts,
+    $core.Iterable<$60.User>? contacts,
  }) {
-    final result = create();
-    if (contacts != null) result.contacts.addAll(contacts);
-    return result;
+    final $result = create();
+    if (contacts != null) {
+      $result.contacts.addAll(contacts);
+    }
+    return $result;
  }
-
-  ClaimGetAvailableContactsResult._();
-
-  factory ClaimGetAvailableContactsResult.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory ClaimGetAvailableContactsResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  ClaimGetAvailableContactsResult._() : super();
+  factory ClaimGetAvailableContactsResult.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory ClaimGetAvailableContactsResult.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ClaimGetAvailableContactsResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..pc<$4.User>(1, _omitFieldNames ? '' : 'Contacts', $pb.PbFieldType.PM, protoName: 'Contacts', subBuilder: $4.User.create)
+    ..pc<$60.User>(1, _omitFieldNames ? '' : 'Contacts', $pb.PbFieldType.PM, protoName: 'Contacts', subBuilder: $60.User.create)
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  ClaimGetAvailableContactsResult clone() => ClaimGetAvailableContactsResult()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  ClaimGetAvailableContactsResult copyWith(void Function(ClaimGetAvailableContactsResult) updates) => super.copyWith((message) => updates(message as ClaimGetAvailableContactsResult)) as ClaimGetAvailableContactsResult;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static ClaimGetAvailableContactsResult create() => ClaimGetAvailableContactsResult._();
-  @$core.override
  ClaimGetAvailableContactsResult createEmptyInstance() => create();
  static $pb.PbList<ClaimGetAvailableContactsResult> createRepeated() => $pb.PbList<ClaimGetAvailableContactsResult>();
  @$core.pragma('dart2js:noInline')
@@ -647,9 +652,9 @@ class ClaimGetAvailableContactsResult extends $pb.GeneratedMessage {
  static ClaimGetAvailableContactsResult? _defaultInstance;

  @$pb.TagNumber(1)
-  $pb.PbList<$4.User> get contacts => $_getList(0);
+  $pb.PbList<$60.User> get contacts => $_getList(0);
 }


-const $core.bool _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
-const $core.bool _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
+const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
+const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
--- a/lib/claimQuery.pbenum.dart
+++ b/lib/claimQuery.pbenum.dart
@@ -1,12 +1,11 @@
-// This is a generated file - do not edit.
 //
-// Generated from claimQuery.proto.
-
+//  Generated code. Do not modify.
+//  source: claimQuery.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

--- a/lib/claimQuery.pbgrpc.dart
+++ b/lib/claimQuery.pbgrpc.dart
@@ -1,14 +1,13 @@
-// This is a generated file - do not edit.
 //
-// Generated from claimQuery.proto.
-
+//  Generated code. Do not modify.
+//  source: claimQuery.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:async' as $async;
 import 'dart:core' as $core;
@@ -16,98 +15,88 @@ import 'dart:core' as $core;
 import 'package:grpc/service_api.dart' as $grpc;
 import 'package:protobuf/protobuf.dart' as $pb;

-import 'claimQuery.pb.dart' as $0;
-import 'clickhouse.pb.dart' as $2;
-import 'shared.pb.dart' as $1;
+import 'claimQuery.pb.dart' as $12;
+import 'clickhouse.pb.dart' as $13;
+import 'shared.pb.dart' as $3;

 export 'claimQuery.pb.dart';

@$pb.GrpcServiceName('api.ClaimQuery')
 class ClaimQueryClient extends $grpc.Client {
-  /// The hostname for this service.
-  static const $core.String defaultHost = '';
-
-  /// OAuth scopes needed for the client.
-  static const $core.List<$core.String> oauthScopes = [
-    '',
-  ];
+  static final _$getByIds = $grpc.ClientMethod<$12.ClaimByIdQuery, $12.ClaimByIdResult>(
+      '/api.ClaimQuery/GetByIds',
+      ($12.ClaimByIdQuery value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $12.ClaimByIdResult.fromBuffer(value));
+  static final _$find = $grpc.ClientMethod<$12.ClaimByFilterQuery, $12.ClaimByFilterResult>(
+      '/api.ClaimQuery/Find',
+      ($12.ClaimByFilterQuery value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $12.ClaimByFilterResult.fromBuffer(value));
+  static final _$findMatchingFieldValues = $grpc.ClientMethod<$12.ClaimByMatchQuery, $12.ClaimByMatchResult>(
+      '/api.ClaimQuery/FindMatchingFieldValues',
+      ($12.ClaimByMatchQuery value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $12.ClaimByMatchResult.fromBuffer(value));
+  static final _$findMatchingFieldElements = $grpc.ClientMethod<$3.ElementByMatchQuery, $3.ElementByMatchResult>(
+      '/api.ClaimQuery/FindMatchingFieldElements',
+      ($3.ElementByMatchQuery value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $3.ElementByMatchResult.fromBuffer(value));
+  static final _$extract = $grpc.ClientMethod<$3.ExtractQuery, $3.ExtractResult>(
+      '/api.ClaimQuery/Extract',
+      ($3.ExtractQuery value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $3.ExtractResult.fromBuffer(value));
+  static final _$getKPIData = $grpc.ClientMethod<$13.GetKPIDataQuery, $13.GetKPIDataResult>(
+      '/api.ClaimQuery/GetKPIData',
+      ($13.GetKPIDataQuery value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $13.GetKPIDataResult.fromBuffer(value));
+  static final _$getRoom = $grpc.ClientMethod<$12.ClaimGetRoomQuery, $12.ClaimGetRoomResult>(
+      '/api.ClaimQuery/GetRoom',
+      ($12.ClaimGetRoomQuery value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $12.ClaimGetRoomResult.fromBuffer(value));
+  static final _$countLines = $grpc.ClientMethod<$3.CountLinesQuery, $3.CountLinesResult>(
+      '/api.ClaimQuery/CountLines',
+      ($3.CountLinesQuery value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $3.CountLinesResult.fromBuffer(value));
+  static final _$getAvailableContacts = $grpc.ClientMethod<$12.ClaimGetAvailableContactsQuery, $12.ClaimGetAvailableContactsResult>(
+      '/api.ClaimQuery/GetAvailableContacts',
+      ($12.ClaimGetAvailableContactsQuery value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $12.ClaimGetAvailableContactsResult.fromBuffer(value));

  ClaimQueryClient(super.channel, {super.options, super.interceptors});

-  $grpc.ResponseFuture<$0.ClaimByIdResult> getByIds($0.ClaimByIdQuery request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$12.ClaimByIdResult> getByIds($12.ClaimByIdQuery request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$getByIds, request, options: options);
  }

-  $grpc.ResponseFuture<$0.ClaimByFilterResult> find($0.ClaimByFilterQuery request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$12.ClaimByFilterResult> find($12.ClaimByFilterQuery request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$find, request, options: options);
  }

-  $grpc.ResponseFuture<$0.ClaimByMatchResult> findMatchingFieldValues($0.ClaimByMatchQuery request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$12.ClaimByMatchResult> findMatchingFieldValues($12.ClaimByMatchQuery request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$findMatchingFieldValues, request, options: options);
  }

-  $grpc.ResponseFuture<$1.ElementByMatchResult> findMatchingFieldElements($1.ElementByMatchQuery request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$3.ElementByMatchResult> findMatchingFieldElements($3.ElementByMatchQuery request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$findMatchingFieldElements, request, options: options);
  }

-  $grpc.ResponseFuture<$1.ExtractResult> extract($1.ExtractQuery request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$3.ExtractResult> extract($3.ExtractQuery request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$extract, request, options: options);
  }

-  $grpc.ResponseFuture<$2.GetKPIDataResult> getKPIData($2.GetKPIDataQuery request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$13.GetKPIDataResult> getKPIData($13.GetKPIDataQuery request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$getKPIData, request, options: options);
  }

-  $grpc.ResponseFuture<$0.ClaimGetRoomResult> getRoom($0.ClaimGetRoomQuery request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$12.ClaimGetRoomResult> getRoom($12.ClaimGetRoomQuery request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$getRoom, request, options: options);
  }

-  $grpc.ResponseFuture<$1.CountLinesResult> countLines($1.CountLinesQuery request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$3.CountLinesResult> countLines($3.CountLinesQuery request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$countLines, request, options: options);
  }

-  $grpc.ResponseFuture<$0.ClaimGetAvailableContactsResult> getAvailableContacts($0.ClaimGetAvailableContactsQuery request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$12.ClaimGetAvailableContactsResult> getAvailableContacts($12.ClaimGetAvailableContactsQuery request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$getAvailableContacts, request, options: options);
  }
-
-    // method descriptors
-
-  static final _$getByIds = $grpc.ClientMethod<$0.ClaimByIdQuery, $0.ClaimByIdResult>(
-      '/api.ClaimQuery/GetByIds',
-      ($0.ClaimByIdQuery value) => value.writeToBuffer(),
-      $0.ClaimByIdResult.fromBuffer);
-  static final _$find = $grpc.ClientMethod<$0.ClaimByFilterQuery, $0.ClaimByFilterResult>(
-      '/api.ClaimQuery/Find',
-      ($0.ClaimByFilterQuery value) => value.writeToBuffer(),
-      $0.ClaimByFilterResult.fromBuffer);
-  static final _$findMatchingFieldValues = $grpc.ClientMethod<$0.ClaimByMatchQuery, $0.ClaimByMatchResult>(
-      '/api.ClaimQuery/FindMatchingFieldValues',
-      ($0.ClaimByMatchQuery value) => value.writeToBuffer(),
-      $0.ClaimByMatchResult.fromBuffer);
-  static final _$findMatchingFieldElements = $grpc.ClientMethod<$1.ElementByMatchQuery, $1.ElementByMatchResult>(
-      '/api.ClaimQuery/FindMatchingFieldElements',
-      ($1.ElementByMatchQuery value) => value.writeToBuffer(),
-      $1.ElementByMatchResult.fromBuffer);
-  static final _$extract = $grpc.ClientMethod<$1.ExtractQuery, $1.ExtractResult>(
-      '/api.ClaimQuery/Extract',
-      ($1.ExtractQuery value) => value.writeToBuffer(),
-      $1.ExtractResult.fromBuffer);
-  static final _$getKPIData = $grpc.ClientMethod<$2.GetKPIDataQuery, $2.GetKPIDataResult>(
-      '/api.ClaimQuery/GetKPIData',
-      ($2.GetKPIDataQuery value) => value.writeToBuffer(),
-      $2.GetKPIDataResult.fromBuffer);
-  static final _$getRoom = $grpc.ClientMethod<$0.ClaimGetRoomQuery, $0.ClaimGetRoomResult>(
-      '/api.ClaimQuery/GetRoom',
-      ($0.ClaimGetRoomQuery value) => value.writeToBuffer(),
-      $0.ClaimGetRoomResult.fromBuffer);
-  static final _$countLines = $grpc.ClientMethod<$1.CountLinesQuery, $1.CountLinesResult>(
-      '/api.ClaimQuery/CountLines',
-      ($1.CountLinesQuery value) => value.writeToBuffer(),
-      $1.CountLinesResult.fromBuffer);
-  static final _$getAvailableContacts = $grpc.ClientMethod<$0.ClaimGetAvailableContactsQuery, $0.ClaimGetAvailableContactsResult>(
-      '/api.ClaimQuery/GetAvailableContacts',
-      ($0.ClaimGetAvailableContactsQuery value) => value.writeToBuffer(),
-      $0.ClaimGetAvailableContactsResult.fromBuffer);
 }

@$pb.GrpcServiceName('api.ClaimQuery')
@@ -115,123 +104,114 @@ abstract class ClaimQueryServiceBase extends $grpc.Service {
  $core.String get $name => 'api.ClaimQuery';

  ClaimQueryServiceBase() {
-    $addMethod($grpc.ServiceMethod<$0.ClaimByIdQuery, $0.ClaimByIdResult>(
+    $addMethod($grpc.ServiceMethod<$12.ClaimByIdQuery, $12.ClaimByIdResult>(
        'GetByIds',
        getByIds_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.ClaimByIdQuery.fromBuffer(value),
-        ($0.ClaimByIdResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.ClaimByFilterQuery, $0.ClaimByFilterResult>(
+        ($core.List<$core.int> value) => $12.ClaimByIdQuery.fromBuffer(value),
+        ($12.ClaimByIdResult value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$12.ClaimByFilterQuery, $12.ClaimByFilterResult>(
        'Find',
        find_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.ClaimByFilterQuery.fromBuffer(value),
-        ($0.ClaimByFilterResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.ClaimByMatchQuery, $0.ClaimByMatchResult>(
+        ($core.List<$core.int> value) => $12.ClaimByFilterQuery.fromBuffer(value),
+        ($12.ClaimByFilterResult value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$12.ClaimByMatchQuery, $12.ClaimByMatchResult>(
        'FindMatchingFieldValues',
        findMatchingFieldValues_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.ClaimByMatchQuery.fromBuffer(value),
-        ($0.ClaimByMatchResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$1.ElementByMatchQuery, $1.ElementByMatchResult>(
+        ($core.List<$core.int> value) => $12.ClaimByMatchQuery.fromBuffer(value),
+        ($12.ClaimByMatchResult value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$3.ElementByMatchQuery, $3.ElementByMatchResult>(
        'FindMatchingFieldElements',
        findMatchingFieldElements_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $1.ElementByMatchQuery.fromBuffer(value),
-        ($1.ElementByMatchResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$1.ExtractQuery, $1.ExtractResult>(
+        ($core.List<$core.int> value) => $3.ElementByMatchQuery.fromBuffer(value),
+        ($3.ElementByMatchResult value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$3.ExtractQuery, $3.ExtractResult>(
        'Extract',
        extract_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $1.ExtractQuery.fromBuffer(value),
-        ($1.ExtractResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$2.GetKPIDataQuery, $2.GetKPIDataResult>(
+        ($core.List<$core.int> value) => $3.ExtractQuery.fromBuffer(value),
+        ($3.ExtractResult value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$13.GetKPIDataQuery, $13.GetKPIDataResult>(
        'GetKPIData',
        getKPIData_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $2.GetKPIDataQuery.fromBuffer(value),
-        ($2.GetKPIDataResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.ClaimGetRoomQuery, $0.ClaimGetRoomResult>(
+        ($core.List<$core.int> value) => $13.GetKPIDataQuery.fromBuffer(value),
+        ($13.GetKPIDataResult value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$12.ClaimGetRoomQuery, $12.ClaimGetRoomResult>(
        'GetRoom',
        getRoom_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.ClaimGetRoomQuery.fromBuffer(value),
-        ($0.ClaimGetRoomResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$1.CountLinesQuery, $1.CountLinesResult>(
+        ($core.List<$core.int> value) => $12.ClaimGetRoomQuery.fromBuffer(value),
+        ($12.ClaimGetRoomResult value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$3.CountLinesQuery, $3.CountLinesResult>(
        'CountLines',
        countLines_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $1.CountLinesQuery.fromBuffer(value),
-        ($1.CountLinesResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.ClaimGetAvailableContactsQuery, $0.ClaimGetAvailableContactsResult>(
+        ($core.List<$core.int> value) => $3.CountLinesQuery.fromBuffer(value),
+        ($3.CountLinesResult value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$12.ClaimGetAvailableContactsQuery, $12.ClaimGetAvailableContactsResult>(
        'GetAvailableContacts',
        getAvailableContacts_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.ClaimGetAvailableContactsQuery.fromBuffer(value),
-        ($0.ClaimGetAvailableContactsResult value) => value.writeToBuffer()));
+        ($core.List<$core.int> value) => $12.ClaimGetAvailableContactsQuery.fromBuffer(value),
+        ($12.ClaimGetAvailableContactsResult value) => value.writeToBuffer()));
  }

-  $async.Future<$0.ClaimByIdResult> getByIds_Pre($grpc.ServiceCall $call, $async.Future<$0.ClaimByIdQuery> $request) async {
+  $async.Future<$12.ClaimByIdResult> getByIds_Pre($grpc.ServiceCall $call, $async.Future<$12.ClaimByIdQuery> $request) async {
    return getByIds($call, await $request);
  }

-  $async.Future<$0.ClaimByIdResult> getByIds($grpc.ServiceCall call, $0.ClaimByIdQuery request);
-
-  $async.Future<$0.ClaimByFilterResult> find_Pre($grpc.ServiceCall $call, $async.Future<$0.ClaimByFilterQuery> $request) async {
+  $async.Future<$12.ClaimByFilterResult> find_Pre($grpc.ServiceCall $call, $async.Future<$12.ClaimByFilterQuery> $request) async {
    return find($call, await $request);
  }

-  $async.Future<$0.ClaimByFilterResult> find($grpc.ServiceCall call, $0.ClaimByFilterQuery request);
-
-  $async.Future<$0.ClaimByMatchResult> findMatchingFieldValues_Pre($grpc.ServiceCall $call, $async.Future<$0.ClaimByMatchQuery> $request) async {
+  $async.Future<$12.ClaimByMatchResult> findMatchingFieldValues_Pre($grpc.ServiceCall $call, $async.Future<$12.ClaimByMatchQuery> $request) async {
    return findMatchingFieldValues($call, await $request);
  }

-  $async.Future<$0.ClaimByMatchResult> findMatchingFieldValues($grpc.ServiceCall call, $0.ClaimByMatchQuery request);
-
-  $async.Future<$1.ElementByMatchResult> findMatchingFieldElements_Pre($grpc.ServiceCall $call, $async.Future<$1.ElementByMatchQuery> $request) async {
+  $async.Future<$3.ElementByMatchResult> findMatchingFieldElements_Pre($grpc.ServiceCall $call, $async.Future<$3.ElementByMatchQuery> $request) async {
    return findMatchingFieldElements($call, await $request);
  }

-  $async.Future<$1.ElementByMatchResult> findMatchingFieldElements($grpc.ServiceCall call, $1.ElementByMatchQuery request);
-
-  $async.Future<$1.ExtractResult> extract_Pre($grpc.ServiceCall $call, $async.Future<$1.ExtractQuery> $request) async {
+  $async.Future<$3.ExtractResult> extract_Pre($grpc.ServiceCall $call, $async.Future<$3.ExtractQuery> $request) async {
    return extract($call, await $request);
  }

-  $async.Future<$1.ExtractResult> extract($grpc.ServiceCall call, $1.ExtractQuery request);
-
-  $async.Future<$2.GetKPIDataResult> getKPIData_Pre($grpc.ServiceCall $call, $async.Future<$2.GetKPIDataQuery> $request) async {
+  $async.Future<$13.GetKPIDataResult> getKPIData_Pre($grpc.ServiceCall $call, $async.Future<$13.GetKPIDataQuery> $request) async {
    return getKPIData($call, await $request);
  }

-  $async.Future<$2.GetKPIDataResult> getKPIData($grpc.ServiceCall call, $2.GetKPIDataQuery request);
-
-  $async.Future<$0.ClaimGetRoomResult> getRoom_Pre($grpc.ServiceCall $call, $async.Future<$0.ClaimGetRoomQuery> $request) async {
+  $async.Future<$12.ClaimGetRoomResult> getRoom_Pre($grpc.ServiceCall $call, $async.Future<$12.ClaimGetRoomQuery> $request) async {
    return getRoom($call, await $request);
  }

-  $async.Future<$0.ClaimGetRoomResult> getRoom($grpc.ServiceCall call, $0.ClaimGetRoomQuery request);
-
-  $async.Future<$1.CountLinesResult> countLines_Pre($grpc.ServiceCall $call, $async.Future<$1.CountLinesQuery> $request) async {
+  $async.Future<$3.CountLinesResult> countLines_Pre($grpc.ServiceCall $call, $async.Future<$3.CountLinesQuery> $request) async {
    return countLines($call, await $request);
  }

-  $async.Future<$1.CountLinesResult> countLines($grpc.ServiceCall call, $1.CountLinesQuery request);
-
-  $async.Future<$0.ClaimGetAvailableContactsResult> getAvailableContacts_Pre($grpc.ServiceCall $call, $async.Future<$0.ClaimGetAvailableContactsQuery> $request) async {
+  $async.Future<$12.ClaimGetAvailableContactsResult> getAvailableContacts_Pre($grpc.ServiceCall $call, $async.Future<$12.ClaimGetAvailableContactsQuery> $request) async {
    return getAvailableContacts($call, await $request);
  }

-  $async.Future<$0.ClaimGetAvailableContactsResult> getAvailableContacts($grpc.ServiceCall call, $0.ClaimGetAvailableContactsQuery request);
-
+  $async.Future<$12.ClaimByIdResult> getByIds($grpc.ServiceCall call, $12.ClaimByIdQuery request);
+  $async.Future<$12.ClaimByFilterResult> find($grpc.ServiceCall call, $12.ClaimByFilterQuery request);
+  $async.Future<$12.ClaimByMatchResult> findMatchingFieldValues($grpc.ServiceCall call, $12.ClaimByMatchQuery request);
+  $async.Future<$3.ElementByMatchResult> findMatchingFieldElements($grpc.ServiceCall call, $3.ElementByMatchQuery request);
+  $async.Future<$3.ExtractResult> extract($grpc.ServiceCall call, $3.ExtractQuery request);
+  $async.Future<$13.GetKPIDataResult> getKPIData($grpc.ServiceCall call, $13.GetKPIDataQuery request);
+  $async.Future<$12.ClaimGetRoomResult> getRoom($grpc.ServiceCall call, $12.ClaimGetRoomQuery request);
+  $async.Future<$3.CountLinesResult> countLines($grpc.ServiceCall call, $3.CountLinesQuery request);
+  $async.Future<$12.ClaimGetAvailableContactsResult> getAvailableContacts($grpc.ServiceCall call, $12.ClaimGetAvailableContactsQuery request);
 }
--- a/lib/claimQuery.pbjson.dart
+++ b/lib/claimQuery.pbjson.dart
@@ -1,14 +1,13 @@
-// This is a generated file - do not edit.
 //
-// Generated from claimQuery.proto.
-
+//  Generated code. Do not modify.
+//  source: claimQuery.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
@@ -20,7 +19,6 @@ const ClaimByIdQuery$json = {
  '2': [
    {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.QueryProjectHeader', '8': {}, '10': 'Header'},
    {'1': 'IDs', '3': 2, '4': 3, '5': 11, '6': '.api.EntityID', '8': {}, '10': 'IDs'},
-    {'1': 'Options', '3': 3, '4': 1, '5': 11, '6': '.api.ClaimQueryOptions', '10': 'Options'},
  ],
  '7': {},
 };
@@ -29,8 +27,7 @@ const ClaimByIdQuery$json = {
 final $typed_data.Uint8List claimByIdQueryDescriptor = $convert.base64Decode(
    'Cg5DbGFpbUJ5SWRRdWVyeRI5CgZIZWFkZXIYASABKAsyFy5hcGkuUXVlcnlQcm9qZWN0SGVhZG'
    'VyQgj6QgWKAQIQAVIGSGVhZGVyEikKA0lEcxgCIAMoCzINLmFwaS5FbnRpdHlJREII+kIFkgEC'
-    'CAFSA0lEcxIwCgdPcHRpb25zGAMgASgLMhYuYXBpLkNsYWltUXVlcnlPcHRpb25zUgdPcHRpb2'
-    '5zOh2SQREKD9IBBkhlYWRlctIBA0lEc6K7GAVRdWVyeQ==');
+    'CAFSA0lEczodkkERCg/SAQZIZWFkZXLSAQNJRHOiuxgFUXVlcnk=');

@$core.Deprecated('Use claimByIdResultDescriptor instead')
 const ClaimByIdResult$json = {
@@ -56,7 +53,6 @@ const ClaimByFilterQuery$json = {
    {'1': 'limitFilter', '3': 4, '4': 1, '5': 9, '8': {}, '10': 'limitFilter'},
    {'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'},
  ],
  '7': {},
 };
@@ -67,8 +63,7 @@ final $typed_data.Uint8List claimByFilterQueryDescriptor = $convert.base64Decode
    'hlYWRlckILkkEA+kIFigECEAFSBkhlYWRlchJGCgtsaW1pdEZpbHRlchgEIAEoCUIkkkEhMhhO'
    'dW1iZXIgb2YgbWF4aW11bSByZXN1bHRKBSI1MDAiUgtsaW1pdEZpbHRlchIiCgxxdWVyeUNvbn'
    'RleHQYBSABKAlSDHF1ZXJ5Q29udGV4dBI0CgxCbG9ja0ZpbHRlcnMYBiADKAsyEC5hcGkuQmxv'
-    'Y2tGaWx0ZXJSDEJsb2NrRmlsdGVycxIwCgdPcHRpb25zGAcgASgLMhYuYXBpLkNsYWltUXVlcn'
-    'lPcHRpb25zUgdPcHRpb25zOg6SQQsKCdIBBkhlYWRlcg==');
+    'Y2tGaWx0ZXJSDEJsb2NrRmlsdGVyczoOkkELCgnSAQZIZWFkZXI=');

@$core.Deprecated('Use claimByFilterResultDescriptor instead')
 const ClaimByFilterResult$json = {
@@ -86,15 +81,6 @@ final $typed_data.Uint8List claimByFilterResultDescriptor = $convert.base64Decod
    'JSBkhlYWRlchIkCgdPYmplY3RzGAIgAygLMgouYXBpLkNsYWltUgdPYmplY3RzEiIKDHF1ZXJ5'
    'Q29udGV4dBgDIAEoCVIMcXVlcnlDb250ZXh0');

-@$core.Deprecated('Use claimQueryOptionsDescriptor instead')
-const ClaimQueryOptions$json = {
-  '1': 'ClaimQueryOptions',
-};
-
-/// Descriptor for `ClaimQueryOptions`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List claimQueryOptionsDescriptor = $convert.base64Decode(
-    'ChFDbGFpbVF1ZXJ5T3B0aW9ucw==');
-
@$core.Deprecated('Use claimByMatchQueryDescriptor instead')
 const ClaimByMatchQuery$json = {
  '1': 'ClaimByMatchQuery',
--- a/lib/clickhouse.pb.dart
+++ b/lib/clickhouse.pb.dart
--- a/lib/clickhouse.pbenum.dart
+++ b/lib/clickhouse.pbenum.dart
@@ -1,14 +1,13 @@
-// This is a generated file - do not edit.
 //
-// Generated from clickhouse.proto.
-
+//  Generated code. Do not modify.
+//  source: clickhouse.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:core' as $core;

@@ -41,10 +40,10 @@ class CHChartType extends $pb.ProtobufEnum {
    CH_CHART_TYPE_PIVOT_TABLE,
  ];

-  static final $core.List<CHChartType?> _byValue = $pb.ProtobufEnum.$_initByValueList(values, 10);
-  static CHChartType? valueOf($core.int value) =>  value < 0 || value >= _byValue.length ? null : _byValue[value];
+  static final $core.Map<$core.int, CHChartType> _byValue = $pb.ProtobufEnum.initByValue(values);
+  static CHChartType? valueOf($core.int value) => _byValue[value];

-  const CHChartType._(super.value, super.name);
+  const CHChartType._(super.v, super.n);
 }

 class CHQueryType extends $pb.ProtobufEnum {
@@ -60,10 +59,10 @@ class CHQueryType extends $pb.ProtobufEnum {
    CH_QUERY_TYPE_C,
  ];

-  static final $core.List<CHQueryType?> _byValue = $pb.ProtobufEnum.$_initByValueList(values, 3);
-  static CHQueryType? valueOf($core.int value) =>  value < 0 || value >= _byValue.length ? null : _byValue[value];
+  static final $core.Map<$core.int, CHQueryType> _byValue = $pb.ProtobufEnum.initByValue(values);
+  static CHQueryType? valueOf($core.int value) => _byValue[value];

-  const CHQueryType._(super.value, super.name);
+  const CHQueryType._(super.v, super.n);
 }

 class KpiDataResultFormat extends $pb.ProtobufEnum {
@@ -75,11 +74,11 @@ class KpiDataResultFormat extends $pb.ProtobufEnum {
    KPIDATA_RESULT_FORMAT_SERIES,
  ];

-  static final $core.List<KpiDataResultFormat?> _byValue = $pb.ProtobufEnum.$_initByValueList(values, 1);
-  static KpiDataResultFormat? valueOf($core.int value) =>  value < 0 || value >= _byValue.length ? null : _byValue[value];
+  static final $core.Map<$core.int, KpiDataResultFormat> _byValue = $pb.ProtobufEnum.initByValue(values);
+  static KpiDataResultFormat? valueOf($core.int value) => _byValue[value];

-  const KpiDataResultFormat._(super.value, super.name);
+  const KpiDataResultFormat._(super.v, super.n);
 }


-const $core.bool _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names');
+const _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names');
--- a/lib/clickhouse.pbjson.dart
+++ b/lib/clickhouse.pbjson.dart
@@ -1,14 +1,13 @@
-// This is a generated file - do not edit.
 //
-// Generated from clickhouse.proto.
-
+//  Generated code. Do not modify.
+//  source: clickhouse.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
@@ -219,45 +218,6 @@ final $typed_data.Uint8List getKPIDataQueryDescriptor = $convert.base64Decode(
    'CUNoYXJ0VHlwZdIBCVF1ZXJ5VHlwZdIBClF1ZXJ5QmxvY2vSAQdNZXRyaWNz0gEMS3BpR3JvdX'
    'BOYW1l');

-@$core.Deprecated('Use getKPIDataSiteQueryDescriptor instead')
-const GetKPIDataSiteQuery$json = {
-  '1': 'GetKPIDataSiteQuery',
-  '2': [
-    {'1': 'Header', '3': 1, '4': 1, '5': 11, '6': '.api.QuerySiteHeader', '8': {}, '10': 'Header'},
-    {'1': 'ChartType', '3': 2, '4': 1, '5': 14, '6': '.api.CHChartType', '8': {}, '10': 'ChartType'},
-    {'1': 'QueryType', '3': 3, '4': 1, '5': 14, '6': '.api.CHQueryType', '8': {}, '10': 'QueryType'},
-    {'1': 'QueryBlock', '3': 4, '4': 1, '5': 9, '8': {}, '10': 'QueryBlock'},
-    {'1': 'Dimensions', '3': 5, '4': 3, '5': 11, '6': '.api.CHDimension', '10': 'Dimensions'},
-    {'1': 'Metrics', '3': 6, '4': 3, '5': 11, '6': '.api.CHMetric', '10': 'Metrics'},
-    {'1': 'Filter', '3': 7, '4': 1, '5': 11, '6': '.api.CHFilter', '10': 'Filter'},
-    {'1': 'TargetTimeZone', '3': 8, '4': 1, '5': 9, '8': {}, '10': 'TargetTimeZone'},
-    {'1': 'ResultFormat', '3': 9, '4': 1, '5': 14, '6': '.api.KpiDataResultFormat', '8': {}, '10': 'ResultFormat'},
-    {'1': 'KpiGroupName', '3': 10, '4': 1, '5': 9, '8': {}, '10': 'KpiGroupName'},
-  ],
-  '7': {},
-};
-
-/// Descriptor for `GetKPIDataSiteQuery`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List getKPIDataSiteQueryDescriptor = $convert.base64Decode(
-    'ChNHZXRLUElEYXRhU2l0ZVF1ZXJ5EjYKBkhlYWRlchgBIAEoCzIULmFwaS5RdWVyeVNpdGVIZW'
-    'FkZXJCCPpCBYoBAhABUgZIZWFkZXISOAoJQ2hhcnRUeXBlGAIgASgOMhAuYXBpLkNIQ2hhcnRU'
-    'eXBlQgj6QgWCAQIQAVIJQ2hhcnRUeXBlEjgKCVF1ZXJ5VHlwZRgDIAEoDjIQLmFwaS5DSFF1ZX'
-    'J5VHlwZUII+kIFggECEAFSCVF1ZXJ5VHlwZRInCgpRdWVyeUJsb2NrGAQgASgJQgf6QgRyAhAB'
-    'UgpRdWVyeUJsb2NrEjAKCkRpbWVuc2lvbnMYBSADKAsyEC5hcGkuQ0hEaW1lbnNpb25SCkRpbW'
-    'Vuc2lvbnMSJwoHTWV0cmljcxgGIAMoCzINLmFwaS5DSE1ldHJpY1IHTWV0cmljcxIlCgZGaWx0'
-    'ZXIYByABKAsyDS5hcGkuQ0hGaWx0ZXJSBkZpbHRlchKwAQoOVGFyZ2V0VGltZVpvbmUYCCABKA'
-    'lChwGSQXoyaFRhcmdldCB1c2VyIHRpbWUgem9uZSAgPGEgaHJlZj0naHR0cHM6Ly9lbi53aWtp'
-    'cGVkaWEub3JnL3dpa2kvTGlzdF9vZl90el9kYXRhYmFzZV90aW1lX3pvbmVzJz5mb3JtYXQ8L2'
-    'E+Sg4iRXVyb3BlL1BhcmlzIvpCB3IFEAHgAQFSDlRhcmdldFRpbWVab25lEnoKDFJlc3VsdEZv'
-    'cm1hdBgJIAEoDjIYLmFwaS5LcGlEYXRhUmVzdWx0Rm9ybWF0QjySQTkyF1Jlc3VsdCBmb3JtYX'
-    'Qgc2VsZWN0aW9uSh4iS1BJREFUQV9SRVNVTFRfRk9STUFUX1NFUklFUyJSDFJlc3VsdEZvcm1h'
-    'dBLJAQoMS3BpR3JvdXBOYW1lGAogASgJQqQBkkFKMjdOYW1lIG9mIHRoZSBhbmFseXNpcyBjcm'
-    'l0ZXJpb24gdG8gZ2V0IHRoZSBrcGkgZGF0YSBmcm9tSg8iZXhlY3V0aW9uZmxvdyL6QlRyUlIN'
-    'ZXhlY3V0aW9uZmxvd1IFc3RvY2tSCG1vdmVtZW50UgxoYW5kbGluZ3VuaXRSBWFjdG9yUgRpdG'
-    'VtUg5zdG9ja19leHRlbmRlZFIFY2xhaW1SDEtwaUdyb3VwTmFtZTpMkkFJCkfSAQZIZWFkZXLS'
-    'AQlDaGFydFR5cGXSAQlRdWVyeVR5cGXSAQpRdWVyeUJsb2Nr0gEHTWV0cmljc9IBDEtwaUdyb3'
-    'VwTmFtZQ==');
-
@$core.Deprecated('Use getKPIDataForUserQueryDescriptor instead')
 const GetKPIDataForUserQuery$json = {
  '1': 'GetKPIDataForUserQuery',
--- a/lib/clickhouseMetrics.pb.dart
+++ b/lib/clickhouseMetrics.pb.dart
@@ -1,14 +1,13 @@
-// This is a generated file - do not edit.
 //
-// Generated from clickhouseMetrics.proto.
-
+//  Generated code. Do not modify.
+//  source: clickhouseMetrics.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:core' as $core;

@@ -28,22 +27,36 @@ class Metrics extends $pb.GeneratedMessage {
    $core.String? userMail,
    $core.String? refID,
  }) {
-    final result = create();
-    if (currentTime != null) result.currentTime = currentTime;
-    if (organisationID != null) result.organisationID = organisationID;
-    if (projectID != null) result.projectID = projectID;
-    if (entityService != null) result.entityService = entityService;
-    if (method != null) result.method = method;
-    if (userID != null) result.userID = userID;
-    if (userMail != null) result.userMail = userMail;
-    if (refID != null) result.refID = refID;
-    return result;
+    final $result = create();
+    if (currentTime != null) {
+      $result.currentTime = currentTime;
+    }
+    if (organisationID != null) {
+      $result.organisationID = organisationID;
+    }
+    if (projectID != null) {
+      $result.projectID = projectID;
+    }
+    if (entityService != null) {
+      $result.entityService = entityService;
+    }
+    if (method != null) {
+      $result.method = method;
+    }
+    if (userID != null) {
+      $result.userID = userID;
+    }
+    if (userMail != null) {
+      $result.userMail = userMail;
+    }
+    if (refID != null) {
+      $result.refID = refID;
+    }
+    return $result;
  }
-
-  Metrics._();
-
-  factory Metrics.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory Metrics.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  Metrics._() : super();
+  factory Metrics.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory Metrics.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Metrics', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
    ..aInt64(1, _omitFieldNames ? '' : 'CurrentTime', protoName: 'CurrentTime')
@@ -57,17 +70,21 @@ class Metrics extends $pb.GeneratedMessage {
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  Metrics clone() => Metrics()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  Metrics copyWith(void Function(Metrics) updates) => super.copyWith((message) => updates(message as Metrics)) as Metrics;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static Metrics create() => Metrics._();
-  @$core.override
  Metrics createEmptyInstance() => create();
  static $pb.PbList<Metrics> createRepeated() => $pb.PbList<Metrics>();
  @$core.pragma('dart2js:noInline')
@@ -77,7 +94,7 @@ class Metrics extends $pb.GeneratedMessage {
  @$pb.TagNumber(1)
  $fixnum.Int64 get currentTime => $_getI64(0);
  @$pb.TagNumber(1)
-  set currentTime($fixnum.Int64 value) => $_setInt64(0, value);
+  set currentTime($fixnum.Int64 v) { $_setInt64(0, v); }
  @$pb.TagNumber(1)
  $core.bool hasCurrentTime() => $_has(0);
  @$pb.TagNumber(1)
@@ -86,7 +103,7 @@ class Metrics extends $pb.GeneratedMessage {
  @$pb.TagNumber(2)
  $core.String get organisationID => $_getSZ(1);
  @$pb.TagNumber(2)
-  set organisationID($core.String value) => $_setString(1, value);
+  set organisationID($core.String v) { $_setString(1, v); }
  @$pb.TagNumber(2)
  $core.bool hasOrganisationID() => $_has(1);
  @$pb.TagNumber(2)
@@ -95,7 +112,7 @@ class Metrics extends $pb.GeneratedMessage {
  @$pb.TagNumber(3)
  $core.String get projectID => $_getSZ(2);
  @$pb.TagNumber(3)
-  set projectID($core.String value) => $_setString(2, value);
+  set projectID($core.String v) { $_setString(2, v); }
  @$pb.TagNumber(3)
  $core.bool hasProjectID() => $_has(2);
  @$pb.TagNumber(3)
@@ -104,7 +121,7 @@ class Metrics extends $pb.GeneratedMessage {
  @$pb.TagNumber(4)
  $core.String get entityService => $_getSZ(3);
  @$pb.TagNumber(4)
-  set entityService($core.String value) => $_setString(3, value);
+  set entityService($core.String v) { $_setString(3, v); }
  @$pb.TagNumber(4)
  $core.bool hasEntityService() => $_has(3);
  @$pb.TagNumber(4)
@@ -113,7 +130,7 @@ class Metrics extends $pb.GeneratedMessage {
  @$pb.TagNumber(5)
  $core.String get method => $_getSZ(4);
  @$pb.TagNumber(5)
-  set method($core.String value) => $_setString(4, value);
+  set method($core.String v) { $_setString(4, v); }
  @$pb.TagNumber(5)
  $core.bool hasMethod() => $_has(4);
  @$pb.TagNumber(5)
@@ -122,7 +139,7 @@ class Metrics extends $pb.GeneratedMessage {
  @$pb.TagNumber(6)
  $core.String get userID => $_getSZ(5);
  @$pb.TagNumber(6)
-  set userID($core.String value) => $_setString(5, value);
+  set userID($core.String v) { $_setString(5, v); }
  @$pb.TagNumber(6)
  $core.bool hasUserID() => $_has(5);
  @$pb.TagNumber(6)
@@ -131,7 +148,7 @@ class Metrics extends $pb.GeneratedMessage {
  @$pb.TagNumber(7)
  $core.String get userMail => $_getSZ(6);
  @$pb.TagNumber(7)
-  set userMail($core.String value) => $_setString(6, value);
+  set userMail($core.String v) { $_setString(6, v); }
  @$pb.TagNumber(7)
  $core.bool hasUserMail() => $_has(6);
  @$pb.TagNumber(7)
@@ -140,7 +157,7 @@ class Metrics extends $pb.GeneratedMessage {
  @$pb.TagNumber(8)
  $core.String get refID => $_getSZ(7);
  @$pb.TagNumber(8)
-  set refID($core.String value) => $_setString(7, value);
+  set refID($core.String v) { $_setString(7, v); }
  @$pb.TagNumber(8)
  $core.bool hasRefID() => $_has(7);
  @$pb.TagNumber(8)
@@ -148,5 +165,5 @@ class Metrics extends $pb.GeneratedMessage {
 }


-const $core.bool _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
-const $core.bool _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
+const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
+const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
--- a/lib/clickhouseMetrics.pbenum.dart
+++ b/lib/clickhouseMetrics.pbenum.dart
@@ -1,12 +1,11 @@
-// This is a generated file - do not edit.
 //
-// Generated from clickhouseMetrics.proto.
-
+//  Generated code. Do not modify.
+//  source: clickhouseMetrics.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

--- a/lib/clickhouseMetrics.pbjson.dart
+++ b/lib/clickhouseMetrics.pbjson.dart
@@ -1,14 +1,13 @@
-// This is a generated file - do not edit.
 //
-// Generated from clickhouseMetrics.proto.
-
+//  Generated code. Do not modify.
+//  source: clickhouseMetrics.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
--- a/lib/client.pb.dart
+++ b/lib/client.pb.dart
@@ -1,20 +1,19 @@
-// This is a generated file - do not edit.
 //
-// Generated from client.proto.
-
+//  Generated code. Do not modify.
+//  source: client.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:core' as $core;

 import 'package:protobuf/protobuf.dart' as $pb;

-import 'shared.pb.dart' as $1;
+import 'shared.pb.dart' as $3;

 export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;

@@ -26,19 +25,27 @@ class OpenIDClient extends $pb.GeneratedMessage {
    $core.Iterable<$core.String>? redirectURIs,
    $core.String? description,
  }) {
-    final result = create();
-    if (appName != null) result.appName = appName;
-    if (displayName != null) result.displayName = displayName;
-    if (rootURI != null) result.rootURI = rootURI;
-    if (redirectURIs != null) result.redirectURIs.addAll(redirectURIs);
-    if (description != null) result.description = description;
-    return result;
+    final $result = create();
+    if (appName != null) {
+      $result.appName = appName;
+    }
+    if (displayName != null) {
+      $result.displayName = displayName;
+    }
+    if (rootURI != null) {
+      $result.rootURI = rootURI;
+    }
+    if (redirectURIs != null) {
+      $result.redirectURIs.addAll(redirectURIs);
+    }
+    if (description != null) {
+      $result.description = description;
+    }
+    return $result;
  }
-
-  OpenIDClient._();
-
-  factory OpenIDClient.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory OpenIDClient.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  OpenIDClient._() : super();
+  factory OpenIDClient.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory OpenIDClient.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'OpenIDClient', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
    ..aOS(1, _omitFieldNames ? '' : 'AppName', protoName: 'AppName')
@@ -49,17 +56,21 @@ class OpenIDClient extends $pb.GeneratedMessage {
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  OpenIDClient clone() => OpenIDClient()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  OpenIDClient copyWith(void Function(OpenIDClient) updates) => super.copyWith((message) => updates(message as OpenIDClient)) as OpenIDClient;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static OpenIDClient create() => OpenIDClient._();
-  @$core.override
  OpenIDClient createEmptyInstance() => create();
  static $pb.PbList<OpenIDClient> createRepeated() => $pb.PbList<OpenIDClient>();
  @$core.pragma('dart2js:noInline')
@@ -69,7 +80,7 @@ class OpenIDClient extends $pb.GeneratedMessage {
  @$pb.TagNumber(1)
  $core.String get appName => $_getSZ(0);
  @$pb.TagNumber(1)
-  set appName($core.String value) => $_setString(0, value);
+  set appName($core.String v) { $_setString(0, v); }
  @$pb.TagNumber(1)
  $core.bool hasAppName() => $_has(0);
  @$pb.TagNumber(1)
@@ -78,7 +89,7 @@ class OpenIDClient extends $pb.GeneratedMessage {
  @$pb.TagNumber(2)
  $core.String get displayName => $_getSZ(1);
  @$pb.TagNumber(2)
-  set displayName($core.String value) => $_setString(1, value);
+  set displayName($core.String v) { $_setString(1, v); }
  @$pb.TagNumber(2)
  $core.bool hasDisplayName() => $_has(1);
  @$pb.TagNumber(2)
@@ -87,7 +98,7 @@ class OpenIDClient extends $pb.GeneratedMessage {
  @$pb.TagNumber(3)
  $core.String get rootURI => $_getSZ(2);
  @$pb.TagNumber(3)
-  set rootURI($core.String value) => $_setString(2, value);
+  set rootURI($core.String v) { $_setString(2, v); }
  @$pb.TagNumber(3)
  $core.bool hasRootURI() => $_has(2);
  @$pb.TagNumber(3)
@@ -99,7 +110,7 @@ class OpenIDClient extends $pb.GeneratedMessage {
  @$pb.TagNumber(5)
  $core.String get description => $_getSZ(4);
  @$pb.TagNumber(5)
-  set description($core.String value) => $_setString(4, value);
+  set description($core.String v) { $_setString(4, v); }
  @$pb.TagNumber(5)
  $core.bool hasDescription() => $_has(4);
  @$pb.TagNumber(5)
@@ -110,32 +121,36 @@ class RegisterPlatformClientRequest extends $pb.GeneratedMessage {
  factory RegisterPlatformClientRequest({
    OpenIDClient? client,
  }) {
-    final result = create();
-    if (client != null) result.client = client;
-    return result;
+    final $result = create();
+    if (client != null) {
+      $result.client = client;
+    }
+    return $result;
  }
-
-  RegisterPlatformClientRequest._();
-
-  factory RegisterPlatformClientRequest.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory RegisterPlatformClientRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  RegisterPlatformClientRequest._() : super();
+  factory RegisterPlatformClientRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory RegisterPlatformClientRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'RegisterPlatformClientRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
    ..aOM<OpenIDClient>(1, _omitFieldNames ? '' : 'Client', protoName: 'Client', subBuilder: OpenIDClient.create)
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  RegisterPlatformClientRequest clone() => RegisterPlatformClientRequest()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  RegisterPlatformClientRequest copyWith(void Function(RegisterPlatformClientRequest) updates) => super.copyWith((message) => updates(message as RegisterPlatformClientRequest)) as RegisterPlatformClientRequest;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static RegisterPlatformClientRequest create() => RegisterPlatformClientRequest._();
-  @$core.override
  RegisterPlatformClientRequest createEmptyInstance() => create();
  static $pb.PbList<RegisterPlatformClientRequest> createRepeated() => $pb.PbList<RegisterPlatformClientRequest>();
  @$core.pragma('dart2js:noInline')
@@ -145,7 +160,7 @@ class RegisterPlatformClientRequest extends $pb.GeneratedMessage {
  @$pb.TagNumber(1)
  OpenIDClient get client => $_getN(0);
  @$pb.TagNumber(1)
-  set client(OpenIDClient value) => $_setField(1, value);
+  set client(OpenIDClient v) { $_setField(1, v); }
  @$pb.TagNumber(1)
  $core.bool hasClient() => $_has(0);
  @$pb.TagNumber(1)
@@ -156,37 +171,43 @@ class RegisterPlatformClientRequest extends $pb.GeneratedMessage {

 class RegisterClientRequest extends $pb.GeneratedMessage {
  factory RegisterClientRequest({
-    $1.RequestOrganisationHeader? header,
+    $3.RequestOrganisationHeader? header,
    OpenIDClient? client,
  }) {
-    final result = create();
-    if (header != null) result.header = header;
-    if (client != null) result.client = client;
-    return result;
+    final $result = create();
+    if (header != null) {
+      $result.header = header;
+    }
+    if (client != null) {
+      $result.client = client;
+    }
+    return $result;
  }
-
-  RegisterClientRequest._();
-
-  factory RegisterClientRequest.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory RegisterClientRequest.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  RegisterClientRequest._() : super();
+  factory RegisterClientRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory RegisterClientRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'RegisterClientRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..aOM<$1.RequestOrganisationHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $1.RequestOrganisationHeader.create)
+    ..aOM<$3.RequestOrganisationHeader>(1, _omitFieldNames ? '' : 'Header', protoName: 'Header', subBuilder: $3.RequestOrganisationHeader.create)
    ..aOM<OpenIDClient>(2, _omitFieldNames ? '' : 'Client', protoName: 'Client', subBuilder: OpenIDClient.create)
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  RegisterClientRequest clone() => RegisterClientRequest()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  RegisterClientRequest copyWith(void Function(RegisterClientRequest) updates) => super.copyWith((message) => updates(message as RegisterClientRequest)) as RegisterClientRequest;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static RegisterClientRequest create() => RegisterClientRequest._();
-  @$core.override
  RegisterClientRequest createEmptyInstance() => create();
  static $pb.PbList<RegisterClientRequest> createRepeated() => $pb.PbList<RegisterClientRequest>();
  @$core.pragma('dart2js:noInline')
@@ -194,20 +215,20 @@ class RegisterClientRequest extends $pb.GeneratedMessage {
  static RegisterClientRequest? _defaultInstance;

  @$pb.TagNumber(1)
-  $1.RequestOrganisationHeader get header => $_getN(0);
+  $3.RequestOrganisationHeader get header => $_getN(0);
  @$pb.TagNumber(1)
-  set header($1.RequestOrganisationHeader value) => $_setField(1, value);
+  set header($3.RequestOrganisationHeader v) { $_setField(1, v); }
  @$pb.TagNumber(1)
  $core.bool hasHeader() => $_has(0);
  @$pb.TagNumber(1)
  void clearHeader() => $_clearField(1);
  @$pb.TagNumber(1)
-  $1.RequestOrganisationHeader ensureHeader() => $_ensure(0);
+  $3.RequestOrganisationHeader ensureHeader() => $_ensure(0);

  @$pb.TagNumber(2)
  OpenIDClient get client => $_getN(1);
  @$pb.TagNumber(2)
-  set client(OpenIDClient value) => $_setField(2, value);
+  set client(OpenIDClient v) { $_setField(2, v); }
  @$pb.TagNumber(2)
  $core.bool hasClient() => $_has(1);
  @$pb.TagNumber(2)
@@ -220,32 +241,36 @@ class RegisterClientResult extends $pb.GeneratedMessage {
  factory RegisterClientResult({
    $core.String? clientID,
  }) {
-    final result = create();
-    if (clientID != null) result.clientID = clientID;
-    return result;
+    final $result = create();
+    if (clientID != null) {
+      $result.clientID = clientID;
+    }
+    return $result;
  }
-
-  RegisterClientResult._();
-
-  factory RegisterClientResult.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
-  factory RegisterClientResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+  RegisterClientResult._() : super();
+  factory RegisterClientResult.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory RegisterClientResult.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'RegisterClientResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
    ..aOS(1, _omitFieldNames ? '' : 'ClientID', protoName: 'ClientID')
    ..hasRequiredFields = false
  ;

-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
  RegisterClientResult clone() => RegisterClientResult()..mergeFromMessage(this);
-  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
  RegisterClientResult copyWith(void Function(RegisterClientResult) updates) => super.copyWith((message) => updates(message as RegisterClientResult)) as RegisterClientResult;

-  @$core.override
  $pb.BuilderInfo get info_ => _i;

  @$core.pragma('dart2js:noInline')
  static RegisterClientResult create() => RegisterClientResult._();
-  @$core.override
  RegisterClientResult createEmptyInstance() => create();
  static $pb.PbList<RegisterClientResult> createRepeated() => $pb.PbList<RegisterClientResult>();
  @$core.pragma('dart2js:noInline')
@@ -255,7 +280,7 @@ class RegisterClientResult extends $pb.GeneratedMessage {
  @$pb.TagNumber(1)
  $core.String get clientID => $_getSZ(0);
  @$pb.TagNumber(1)
-  set clientID($core.String value) => $_setString(0, value);
+  set clientID($core.String v) { $_setString(0, v); }
  @$pb.TagNumber(1)
  $core.bool hasClientID() => $_has(0);
  @$pb.TagNumber(1)
@@ -263,5 +288,5 @@ class RegisterClientResult extends $pb.GeneratedMessage {
 }


-const $core.bool _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
-const $core.bool _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
+const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
+const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');
--- a/lib/client.pbenum.dart
+++ b/lib/client.pbenum.dart
@@ -1,12 +1,11 @@
-// This is a generated file - do not edit.
 //
-// Generated from client.proto.
-
+//  Generated code. Do not modify.
+//  source: client.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

--- a/lib/client.pbgrpc.dart
+++ b/lib/client.pbgrpc.dart
@@ -1,14 +1,13 @@
-// This is a generated file - do not edit.
 //
-// Generated from client.proto.
-
+//  Generated code. Do not modify.
+//  source: client.proto
+//
 // @dart = 3.3

 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: curly_braces_in_flow_control_structures
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

 import 'dart:async' as $async;
 import 'dart:core' as $core;
@@ -16,40 +15,30 @@ import 'dart:core' as $core;
 import 'package:grpc/service_api.dart' as $grpc;
 import 'package:protobuf/protobuf.dart' as $pb;

-import 'client.pb.dart' as $0;
+import 'client.pb.dart' as $14;

 export 'client.pb.dart';

@$pb.GrpcServiceName('api.ClientService')
 class ClientServiceClient extends $grpc.Client {
-  /// The hostname for this service.
-  static const $core.String defaultHost = '';
-
-  /// OAuth scopes needed for the client.
-  static const $core.List<$core.String> oauthScopes = [
-    '',
-  ];
+  static final _$registerPlatformClient = $grpc.ClientMethod<$14.RegisterPlatformClientRequest, $14.RegisterClientResult>(
+      '/api.ClientService/RegisterPlatformClient',
+      ($14.RegisterPlatformClientRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $14.RegisterClientResult.fromBuffer(value));
+  static final _$registerClient = $grpc.ClientMethod<$14.RegisterClientRequest, $14.RegisterClientResult>(
+      '/api.ClientService/RegisterClient',
+      ($14.RegisterClientRequest value) => value.writeToBuffer(),
+      ($core.List<$core.int> value) => $14.RegisterClientResult.fromBuffer(value));

  ClientServiceClient(super.channel, {super.options, super.interceptors});

-  $grpc.ResponseFuture<$0.RegisterClientResult> registerPlatformClient($0.RegisterPlatformClientRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$14.RegisterClientResult> registerPlatformClient($14.RegisterPlatformClientRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$registerPlatformClient, request, options: options);
  }

-  $grpc.ResponseFuture<$0.RegisterClientResult> registerClient($0.RegisterClientRequest request, {$grpc.CallOptions? options,}) {
+  $grpc.ResponseFuture<$14.RegisterClientResult> registerClient($14.RegisterClientRequest request, {$grpc.CallOptions? options}) {
    return $createUnaryCall(_$registerClient, request, options: options);
  }
-
-    // method descriptors
-
-  static final _$registerPlatformClient = $grpc.ClientMethod<$0.RegisterPlatformClientRequest, $0.RegisterClientResult>(
-      '/api.ClientService/RegisterPlatformClient',
-      ($0.RegisterPlatformClientRequest value) => value.writeToBuffer(),
-      $0.RegisterClientResult.fromBuffer);
-  static final _$registerClient = $grpc.ClientMethod<$0.RegisterClientRequest, $0.RegisterClientResult>(
-      '/api.ClientService/RegisterClient',
-      ($0.RegisterClientRequest value) => value.writeToBuffer(),
-      $0.RegisterClientResult.fromBuffer);
 }

@$pb.GrpcServiceName('api.ClientService')
@@ -57,32 +46,30 @@ abstract class ClientServiceBase extends $grpc.Service {
  $core.String get $name => 'api.ClientService';

  ClientServiceBase() {
-    $addMethod($grpc.ServiceMethod<$0.RegisterPlatformClientRequest, $0.RegisterClientResult>(
+    $addMethod($grpc.ServiceMethod<$14.RegisterPlatformClientRequest, $14.RegisterClientResult>(
        'RegisterPlatformClient',
        registerPlatformClient_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.RegisterPlatformClientRequest.fromBuffer(value),
-        ($0.RegisterClientResult value) => value.writeToBuffer()));
-    $addMethod($grpc.ServiceMethod<$0.RegisterClientRequest, $0.RegisterClientResult>(
+        ($core.List<$core.int> value) => $14.RegisterPlatformClientRequest.fromBuffer(value),
+        ($14.RegisterClientResult value) => value.writeToBuffer()));
+    $addMethod($grpc.ServiceMethod<$14.RegisterClientRequest, $14.RegisterClientResult>(
        'RegisterClient',
        registerClient_Pre,
        false,
        false,
-        ($core.List<$core.int> value) => $0.RegisterClientRequest.fromBuffer(value),
-        ($0.RegisterClientResult value) => value.writeToBuffer()));
+        ($core.List<$core.int> value) => $14.RegisterClientRequest.fromBuffer(value),
+        ($14.RegisterClientResult value) => value.writeToBuffer()));
  }

-  $async.Future<$0.RegisterClientResult> registerPlatformClient_Pre($grpc.ServiceCall $call, $async.Future<$0.RegisterPlatformClientRequest> $request) async {
+  $async.Future<$14.RegisterClientResult> registerPlatformClient_Pre($grpc.ServiceCall $call, $async.Future<$14.RegisterPlatformClientRequest> $request) async {
    return registerPlatformClient($call, await $request);
  }

-  $async.Future<$0.RegisterClientResult> registerPlatformClient($grpc.ServiceCall call, $0.RegisterPlatformClientRequest request);
-
-  $async.Future<$0.RegisterClientResult> registerClient_Pre($grpc.ServiceCall $call, $async.Future<$0.RegisterClientRequest> $request) async {
+  $async.Future<$14.RegisterClientResult> registerClient_Pre($grpc.ServiceCall $call, $async.Future<$14.RegisterClientRequest> $request) async {
    return registerClient($call, await $request);
  }

-  $async.Future<$0.RegisterClientResult> registerClient($grpc.ServiceCall call, $0.RegisterClientRequest request);
-
+  $async.Future<$14.RegisterClientResult> registerPlatformClient($grpc.ServiceCall call, $14.RegisterPlatformClientRequest request);
+  $async.Future<$14.RegisterClientResult> registerClient($grpc.ServiceCall call, $14.RegisterClientRequest request);
 }
--- a/Show More
+++ b/Show More