diff --git a/CHANGELOG.md b/CHANGELOG.md
index e3aba87..6a2abb9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,3 @@
 # CHANGELOG
 
-Lib version: 1.10.0-SNAPSHOT-250318155050
+Lib version: 1.10.0-SNAPSHOT-250403082301
diff --git a/lib/annotations.pb.dart b/lib/annotations.pb.dart
index 3b8e5ce..30e96f3 100644
--- a/lib/annotations.pb.dart
+++ b/lib/annotations.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: annotations.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -15,6 +15,8 @@ import 'package:protobuf/protobuf.dart' as $pb;
 
 import 'openapiv2.pb.dart' as $12;
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 class Annotations {
   static final openapiv2Swagger = $pb.Extension<$12.Swagger>(_omitMessageNames ? '' : 'google.protobuf.FileOptions', _omitFieldNames ? '' : 'openapiv2Swagger', 1042, $pb.PbFieldType.OM, defaultOrMaker: $12.Swagger.getDefault, subBuilder: $12.Swagger.create);
   static final openapiv2Operation = $pb.Extension<$12.Operation>(_omitMessageNames ? '' : 'google.protobuf.MethodOptions', _omitFieldNames ? '' : 'openapiv2Operation', 1042, $pb.PbFieldType.OM, defaultOrMaker: $12.Operation.getDefault, subBuilder: $12.Operation.create);
diff --git a/lib/annotations.pbenum.dart b/lib/annotations.pbenum.dart
index 7fd2425..fe78b9f 100644
--- a/lib/annotations.pbenum.dart
+++ b/lib/annotations.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: annotations.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/annotations.pbjson.dart b/lib/annotations.pbjson.dart
index a948f97..e0264ee 100644
--- a/lib/annotations.pbjson.dart
+++ b/lib/annotations.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: annotations.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/core/options.pb.dart b/lib/core/options.pb.dart
index 5acbed6..a4f00cb 100644
--- a/lib/core/options.pb.dart
+++ b/lib/core/options.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: core/options.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -13,6 +13,8 @@ import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 class Options {
   static final entityName = $pb.Extension<$core.String>(_omitMessageNames ? '' : 'google.protobuf.FileOptions', _omitFieldNames ? '' : 'entityName', 50000, $pb.PbFieldType.OS, protoName: 'entityName');
   static final entityShortName = $pb.Extension<$core.String>(_omitMessageNames ? '' : 'google.protobuf.FileOptions', _omitFieldNames ? '' : 'entityShortName', 50001, $pb.PbFieldType.OS, protoName: 'entityShortName');
diff --git a/lib/core/options.pbenum.dart b/lib/core/options.pbenum.dart
index d5fb304..fcb6569 100644
--- a/lib/core/options.pbenum.dart
+++ b/lib/core/options.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: core/options.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/core/options.pbjson.dart b/lib/core/options.pbjson.dart
index b53e35f..18917eb 100644
--- a/lib/core/options.pbjson.dart
+++ b/lib/core/options.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: core/options.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/core/shared.pb.dart b/lib/core/shared.pb.dart
index 1eb31a6..71de2c9 100644
--- a/lib/core/shared.pb.dart
+++ b/lib/core/shared.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: core/shared.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -16,6 +16,8 @@ import 'package:protobuf/protobuf.dart' as $pb;
 
 import 'unitOfMeasures.pbenum.dart' as $15;
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 export 'shared.pbenum.dart';
 
 class RequestHeader extends $pb.GeneratedMessage {
@@ -65,7 +67,7 @@ class RequestHeader extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasProject() => $_has(0);
   @$pb.TagNumber(1)
-  void clearProject() => clearField(1);
+  void clearProject() => $_clearField(1);
 }
 
 /// Header for all requests on project resource
@@ -116,7 +118,7 @@ class RequestProjectHeader extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasProjectID() => $_has(0);
   @$pb.TagNumber(1)
-  void clearProjectID() => clearField(1);
+  void clearProjectID() => $_clearField(1);
 }
 
 /// Header for all requests on project resource
@@ -167,7 +169,7 @@ class RequestOrganisationHeader extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasOrganisationID() => $_has(0);
   @$pb.TagNumber(1)
-  void clearOrganisationID() => clearField(1);
+  void clearOrganisationID() => $_clearField(1);
 }
 
 /// Header for all requests on bucket resources
@@ -218,7 +220,7 @@ class RequestBucketHeader extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasBucketID() => $_has(0);
   @$pb.TagNumber(1)
-  void clearBucketID() => clearField(1);
+  void clearBucketID() => $_clearField(1);
 }
 
 /// Header for all requests on partnerApp resources
@@ -269,7 +271,7 @@ class RequestPartnerAppHeader extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasPartnerAppID() => $_has(0);
   @$pb.TagNumber(1)
-  void clearPartnerAppID() => clearField(1);
+  void clearPartnerAppID() => $_clearField(1);
 }
 
 /// Header for all response messages
@@ -368,7 +370,7 @@ class QueryHeader extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasProject() => $_has(0);
   @$pb.TagNumber(1)
-  void clearProject() => clearField(1);
+  void clearProject() => $_clearField(1);
 
   /// string Author = 2;
   @$pb.TagNumber(3)
@@ -378,7 +380,7 @@ class QueryHeader extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasPagingState() => $_has(1);
   @$pb.TagNumber(3)
-  void clearPagingState() => clearField(3);
+  void clearPagingState() => $_clearField(3);
 
   @$pb.TagNumber(4)
   $core.String get limit => $_getSZ(2);
@@ -387,7 +389,7 @@ class QueryHeader extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasLimit() => $_has(2);
   @$pb.TagNumber(4)
-  void clearLimit() => clearField(4);
+  void clearLimit() => $_clearField(4);
 
   @$pb.TagNumber(5)
   $core.bool get localizedLabel => $_getBF(3);
@@ -396,7 +398,7 @@ class QueryHeader extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $core.bool hasLocalizedLabel() => $_has(3);
   @$pb.TagNumber(5)
-  void clearLocalizedLabel() => clearField(5);
+  void clearLocalizedLabel() => $_clearField(5);
 }
 
 /// Header for all query project messages
@@ -462,7 +464,7 @@ class QueryProjectHeader extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasProjectID() => $_has(0);
   @$pb.TagNumber(1)
-  void clearProjectID() => clearField(1);
+  void clearProjectID() => $_clearField(1);
 
   @$pb.TagNumber(3)
   $core.String get pagingState => $_getSZ(1);
@@ -471,7 +473,7 @@ class QueryProjectHeader extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasPagingState() => $_has(1);
   @$pb.TagNumber(3)
-  void clearPagingState() => clearField(3);
+  void clearPagingState() => $_clearField(3);
 
   @$pb.TagNumber(4)
   $core.String get limit => $_getSZ(2);
@@ -480,7 +482,7 @@ class QueryProjectHeader extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasLimit() => $_has(2);
   @$pb.TagNumber(4)
-  void clearLimit() => clearField(4);
+  void clearLimit() => $_clearField(4);
 
   @$pb.TagNumber(5)
   $core.bool get localizedLabel => $_getBF(3);
@@ -489,7 +491,7 @@ class QueryProjectHeader extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $core.bool hasLocalizedLabel() => $_has(3);
   @$pb.TagNumber(5)
-  void clearLocalizedLabel() => clearField(5);
+  void clearLocalizedLabel() => $_clearField(5);
 }
 
 class ResultHeader extends $pb.GeneratedMessage {
@@ -539,7 +541,7 @@ class ResultHeader extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasPagingState() => $_has(0);
   @$pb.TagNumber(1)
-  void clearPagingState() => clearField(1);
+  void clearPagingState() => $_clearField(1);
 }
 
 /// Header for all command messages
@@ -615,16 +617,16 @@ class CommandHeader extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasActionCommand() => $_has(0);
   @$pb.TagNumber(1)
-  void clearActionCommand() => clearField(1);
+  void clearActionCommand() => $_clearField(1);
 
   @$pb.TagNumber(2)
   DateTime get commandTS => $_getN(1);
   @$pb.TagNumber(2)
-  set commandTS(DateTime v) { setField(2, v); }
+  set commandTS(DateTime v) { $_setField(2, v); }
   @$pb.TagNumber(2)
   $core.bool hasCommandTS() => $_has(1);
   @$pb.TagNumber(2)
-  void clearCommandTS() => clearField(2);
+  void clearCommandTS() => $_clearField(2);
   @$pb.TagNumber(2)
   DateTime ensureCommandTS() => $_ensure(1);
 
@@ -635,7 +637,7 @@ class CommandHeader extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasProject() => $_has(2);
   @$pb.TagNumber(3)
-  void clearProject() => clearField(3);
+  void clearProject() => $_clearField(3);
 
   @$pb.TagNumber(4)
   $core.String get fromDomain => $_getSZ(3);
@@ -644,7 +646,7 @@ class CommandHeader extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasFromDomain() => $_has(3);
   @$pb.TagNumber(4)
-  void clearFromDomain() => clearField(4);
+  void clearFromDomain() => $_clearField(4);
 
   @$pb.TagNumber(5)
   $core.String get fromObject => $_getSZ(4);
@@ -653,7 +655,7 @@ class CommandHeader extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $core.bool hasFromObject() => $_has(4);
   @$pb.TagNumber(5)
-  void clearFromObject() => clearField(5);
+  void clearFromObject() => $_clearField(5);
 
   @$pb.TagNumber(6)
   $core.String get fromRule => $_getSZ(5);
@@ -662,7 +664,7 @@ class CommandHeader extends $pb.GeneratedMessage {
   @$pb.TagNumber(6)
   $core.bool hasFromRule() => $_has(5);
   @$pb.TagNumber(6)
-  void clearFromRule() => clearField(6);
+  void clearFromRule() => $_clearField(6);
 }
 
 /// Header for all event messages
@@ -733,16 +735,16 @@ class EventHeader extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasInputEvent() => $_has(0);
   @$pb.TagNumber(1)
-  void clearInputEvent() => clearField(1);
+  void clearInputEvent() => $_clearField(1);
 
   @$pb.TagNumber(2)
   DateTime get eventTS => $_getN(1);
   @$pb.TagNumber(2)
-  set eventTS(DateTime v) { setField(2, v); }
+  set eventTS(DateTime v) { $_setField(2, v); }
   @$pb.TagNumber(2)
   $core.bool hasEventTS() => $_has(1);
   @$pb.TagNumber(2)
-  void clearEventTS() => clearField(2);
+  void clearEventTS() => $_clearField(2);
   @$pb.TagNumber(2)
   DateTime ensureEventTS() => $_ensure(1);
 
@@ -753,7 +755,7 @@ class EventHeader extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasProject() => $_has(2);
   @$pb.TagNumber(3)
-  void clearProject() => clearField(3);
+  void clearProject() => $_clearField(3);
 
   @$pb.TagNumber(4)
   $core.String get author => $_getSZ(3);
@@ -762,7 +764,7 @@ class EventHeader extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasAuthor() => $_has(3);
   @$pb.TagNumber(4)
-  void clearAuthor() => clearField(4);
+  void clearAuthor() => $_clearField(4);
 
   @$pb.TagNumber(5)
   $core.String get eventID => $_getSZ(4);
@@ -771,7 +773,7 @@ class EventHeader extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $core.bool hasEventID() => $_has(4);
   @$pb.TagNumber(5)
-  void clearEventID() => clearField(5);
+  void clearEventID() => $_clearField(5);
 }
 
 /// Generic Object structures
@@ -823,7 +825,7 @@ class EntityID extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasRefID() => $_has(0);
   @$pb.TagNumber(2)
-  void clearRefID() => clearField(2);
+  void clearRefID() => $_clearField(2);
 }
 
 class GenericObject extends $pb.GeneratedMessage {
@@ -874,22 +876,22 @@ class GenericObject extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   EventHeader get lastEventHeader => $_getN(0);
   @$pb.TagNumber(1)
-  set lastEventHeader(EventHeader v) { setField(1, v); }
+  set lastEventHeader(EventHeader v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasLastEventHeader() => $_has(0);
   @$pb.TagNumber(1)
-  void clearLastEventHeader() => clearField(1);
+  void clearLastEventHeader() => $_clearField(1);
   @$pb.TagNumber(1)
   EventHeader ensureLastEventHeader() => $_ensure(0);
 
   @$pb.TagNumber(2)
   GenericObjectPayload get payload => $_getN(1);
   @$pb.TagNumber(2)
-  set payload(GenericObjectPayload v) { setField(2, v); }
+  set payload(GenericObjectPayload v) { $_setField(2, v); }
   @$pb.TagNumber(2)
   $core.bool hasPayload() => $_has(1);
   @$pb.TagNumber(2)
-  void clearPayload() => clearField(2);
+  void clearPayload() => $_clearField(2);
   @$pb.TagNumber(2)
   GenericObjectPayload ensurePayload() => $_ensure(1);
 }
@@ -937,11 +939,11 @@ class GenericObjectPayload extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   EntityID get iD => $_getN(0);
   @$pb.TagNumber(1)
-  set iD(EntityID v) { setField(1, v); }
+  set iD(EntityID v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasID() => $_has(0);
   @$pb.TagNumber(1)
-  void clearID() => clearField(1);
+  void clearID() => $_clearField(1);
   @$pb.TagNumber(1)
   EntityID ensureID() => $_ensure(0);
 }
@@ -1000,7 +1002,7 @@ class DateTime extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasDateTime() => $_has(0);
   @$pb.TagNumber(1)
-  void clearDateTime() => clearField(1);
+  void clearDateTime() => $_clearField(1);
 
   /// Time zone from where the author emits the event
   @$pb.TagNumber(2)
@@ -1010,7 +1012,7 @@ class DateTime extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasAuthorTimeZone() => $_has(1);
   @$pb.TagNumber(2)
-  void clearAuthorTimeZone() => clearField(2);
+  void clearAuthorTimeZone() => $_clearField(2);
 }
 
 enum ValueType_ValueType {
@@ -1092,7 +1094,7 @@ class ValueType extends $pb.GeneratedMessage {
   static ValueType? _defaultInstance;
 
   ValueType_ValueType whichValueType() => _ValueType_ValueTypeByTag[$_whichOneof(0)]!;
-  void clearValueType() => clearField($_whichOneof(0));
+  void clearValueType() => $_clearField($_whichOneof(0));
 
   @$pb.TagNumber(1)
   $core.String get string => $_getSZ(0);
@@ -1101,7 +1103,7 @@ class ValueType extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasString() => $_has(0);
   @$pb.TagNumber(1)
-  void clearString() => clearField(1);
+  void clearString() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $fixnum.Int64 get int_2 => $_getI64(1);
@@ -1110,7 +1112,7 @@ class ValueType extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasInt_2() => $_has(1);
   @$pb.TagNumber(2)
-  void clearInt_2() => clearField(2);
+  void clearInt_2() => $_clearField(2);
 
   @$pb.TagNumber(3)
   $core.double get float => $_getN(2);
@@ -1119,7 +1121,7 @@ class ValueType extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasFloat() => $_has(2);
   @$pb.TagNumber(3)
-  void clearFloat() => clearField(3);
+  void clearFloat() => $_clearField(3);
 
   @$pb.TagNumber(4)
   $core.bool get bool_4 => $_getBF(3);
@@ -1128,16 +1130,16 @@ class ValueType extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasBool_4() => $_has(3);
   @$pb.TagNumber(4)
-  void clearBool_4() => clearField(4);
+  void clearBool_4() => $_clearField(4);
 
   @$pb.TagNumber(5)
   DateTime get timestamp => $_getN(4);
   @$pb.TagNumber(5)
-  set timestamp(DateTime v) { setField(5, v); }
+  set timestamp(DateTime v) { $_setField(5, v); }
   @$pb.TagNumber(5)
   $core.bool hasTimestamp() => $_has(4);
   @$pb.TagNumber(5)
-  void clearTimestamp() => clearField(5);
+  void clearTimestamp() => $_clearField(5);
   @$pb.TagNumber(5)
   DateTime ensureTimestamp() => $_ensure(4);
 }
@@ -1194,16 +1196,16 @@ class QuantityLength extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasValue() => $_has(0);
   @$pb.TagNumber(1)
-  void clearValue() => clearField(1);
+  void clearValue() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $15.Length get unit => $_getN(1);
   @$pb.TagNumber(2)
-  set unit($15.Length v) { setField(2, v); }
+  set unit($15.Length v) { $_setField(2, v); }
   @$pb.TagNumber(2)
   $core.bool hasUnit() => $_has(1);
   @$pb.TagNumber(2)
-  void clearUnit() => clearField(2);
+  void clearUnit() => $_clearField(2);
 }
 
 class QuantityVolume extends $pb.GeneratedMessage {
@@ -1258,16 +1260,16 @@ class QuantityVolume extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasValue() => $_has(0);
   @$pb.TagNumber(1)
-  void clearValue() => clearField(1);
+  void clearValue() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $15.Volume get unit => $_getN(1);
   @$pb.TagNumber(2)
-  set unit($15.Volume v) { setField(2, v); }
+  set unit($15.Volume v) { $_setField(2, v); }
   @$pb.TagNumber(2)
   $core.bool hasUnit() => $_has(1);
   @$pb.TagNumber(2)
-  void clearUnit() => clearField(2);
+  void clearUnit() => $_clearField(2);
 }
 
 class QuantityWeight extends $pb.GeneratedMessage {
@@ -1322,16 +1324,16 @@ class QuantityWeight extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasValue() => $_has(0);
   @$pb.TagNumber(1)
-  void clearValue() => clearField(1);
+  void clearValue() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $15.Weight get unit => $_getN(1);
   @$pb.TagNumber(2)
-  set unit($15.Weight v) { setField(2, v); }
+  set unit($15.Weight v) { $_setField(2, v); }
   @$pb.TagNumber(2)
   $core.bool hasUnit() => $_has(1);
   @$pb.TagNumber(2)
-  void clearUnit() => clearField(2);
+  void clearUnit() => $_clearField(2);
 }
 
 class QuantityArea extends $pb.GeneratedMessage {
@@ -1386,16 +1388,16 @@ class QuantityArea extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasValue() => $_has(0);
   @$pb.TagNumber(1)
-  void clearValue() => clearField(1);
+  void clearValue() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $15.Area get unit => $_getN(1);
   @$pb.TagNumber(2)
-  set unit($15.Area v) { setField(2, v); }
+  set unit($15.Area v) { $_setField(2, v); }
   @$pb.TagNumber(2)
   $core.bool hasUnit() => $_has(1);
   @$pb.TagNumber(2)
-  void clearUnit() => clearField(2);
+  void clearUnit() => $_clearField(2);
 }
 
 class QuantityUnit extends $pb.GeneratedMessage {
@@ -1450,16 +1452,16 @@ class QuantityUnit extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasValue() => $_has(0);
   @$pb.TagNumber(1)
-  void clearValue() => clearField(1);
+  void clearValue() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $15.DimensionLess get unit => $_getN(1);
   @$pb.TagNumber(2)
-  set unit($15.DimensionLess v) { setField(2, v); }
+  set unit($15.DimensionLess v) { $_setField(2, v); }
   @$pb.TagNumber(2)
   $core.bool hasUnit() => $_has(1);
   @$pb.TagNumber(2)
-  void clearUnit() => clearField(2);
+  void clearUnit() => $_clearField(2);
 }
 
 /// Domain description
@@ -1543,22 +1545,22 @@ class DomainDescriptionResponse extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   ResponseHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header(ResponseHeader v) { setField(1, v); }
+  set header(ResponseHeader v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
-  void clearHeader() => clearField(1);
+  void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
   ResponseHeader ensureHeader() => $_ensure(0);
 
   @$pb.TagNumber(2)
   DomainDescription get payload => $_getN(1);
   @$pb.TagNumber(2)
-  set payload(DomainDescription v) { setField(2, v); }
+  set payload(DomainDescription v) { $_setField(2, v); }
   @$pb.TagNumber(2)
   $core.bool hasPayload() => $_has(1);
   @$pb.TagNumber(2)
-  void clearPayload() => clearField(2);
+  void clearPayload() => $_clearField(2);
   @$pb.TagNumber(2)
   DomainDescription ensurePayload() => $_ensure(1);
 }
@@ -1615,10 +1617,10 @@ class DomainDescription extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasName() => $_has(0);
   @$pb.TagNumber(1)
-  void clearName() => clearField(1);
+  void clearName() => $_clearField(1);
 
   @$pb.TagNumber(2)
-  $core.List<ObjectDescription> get objectDescription => $_getList(1);
+  $pb.PbList<ObjectDescription> get objectDescription => $_getList(1);
 }
 
 class ObjectDescription extends $pb.GeneratedMessage {
@@ -1688,10 +1690,10 @@ class ObjectDescription extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasName() => $_has(0);
   @$pb.TagNumber(1)
-  void clearName() => clearField(1);
+  void clearName() => $_clearField(1);
 
   @$pb.TagNumber(2)
-  $core.List<ObjectAction> get apiAction => $_getList(1);
+  $pb.PbList<ObjectAction> get apiAction => $_getList(1);
 
   @$pb.TagNumber(3)
   $core.String get payloadJSON => $_getSZ(2);
@@ -1700,13 +1702,13 @@ class ObjectDescription extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasPayloadJSON() => $_has(2);
   @$pb.TagNumber(3)
-  void clearPayloadJSON() => clearField(3);
+  void clearPayloadJSON() => $_clearField(3);
 
   @$pb.TagNumber(4)
-  $core.List<ObjectAction> get apiInput => $_getList(3);
+  $pb.PbList<ObjectAction> get apiInput => $_getList(3);
 
   @$pb.TagNumber(5)
-  $core.List<ObjectAction> get apiQuery => $_getList(4);
+  $pb.PbList<ObjectAction> get apiQuery => $_getList(4);
 }
 
 class ObjectAction extends $pb.GeneratedMessage {
@@ -1761,7 +1763,7 @@ class ObjectAction extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasName() => $_has(0);
   @$pb.TagNumber(1)
-  void clearName() => clearField(1);
+  void clearName() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get jsonTemplate => $_getSZ(1);
@@ -1770,7 +1772,7 @@ class ObjectAction extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasJsonTemplate() => $_has(1);
   @$pb.TagNumber(2)
-  void clearJsonTemplate() => clearField(2);
+  void clearJsonTemplate() => $_clearField(2);
 }
 
 /// *
@@ -1827,16 +1829,16 @@ class MetadataElement extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasKey() => $_has(0);
   @$pb.TagNumber(1)
-  void clearKey() => clearField(1);
+  void clearKey() => $_clearField(1);
 
   @$pb.TagNumber(2)
   ValueType get value => $_getN(1);
   @$pb.TagNumber(2)
-  set value(ValueType v) { setField(2, v); }
+  set value(ValueType v) { $_setField(2, v); }
   @$pb.TagNumber(2)
   $core.bool hasValue() => $_has(1);
   @$pb.TagNumber(2)
-  void clearValue() => clearField(2);
+  void clearValue() => $_clearField(2);
   @$pb.TagNumber(2)
   ValueType ensureValue() => $_ensure(1);
 }
@@ -1910,7 +1912,7 @@ class SimpleFilter extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasAttribute() => $_has(0);
   @$pb.TagNumber(1)
-  void clearAttribute() => clearField(1);
+  void clearAttribute() => $_clearField(1);
 
   /// Use this parameter if only one value
   @$pb.TagNumber(2)
@@ -1920,11 +1922,11 @@ class SimpleFilter extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasValue() => $_has(1);
   @$pb.TagNumber(2)
-  void clearValue() => clearField(2);
+  void clearValue() => $_clearField(2);
 
   /// Use this parameter if more than one value
   @$pb.TagNumber(3)
-  $core.List<$core.String> get values => $_getList(2);
+  $pb.PbList<$core.String> get values => $_getList(2);
 
   /// \" EQUAL: 'EQUAL',  DIFF: 'DIFF',  START_BY: 'START_BY',  NOT_START_BY: 'NOT_START_BY',  FINISH_BY: 'FINISH_BY',  NOT_FINISH_BY: 'NOT_FINISH_BY',  CONTAINS: 'CONTAINS',  NOT_CONTAINS: 'NOT_CONTAINS'\"
   @$pb.TagNumber(4)
@@ -1934,7 +1936,7 @@ class SimpleFilter extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasOperator() => $_has(3);
   @$pb.TagNumber(4)
-  void clearOperator() => clearField(4);
+  void clearOperator() => $_clearField(4);
 
   /// metadata's key
   @$pb.TagNumber(5)
@@ -1944,7 +1946,7 @@ class SimpleFilter extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $core.bool hasCombinedID() => $_has(4);
   @$pb.TagNumber(5)
-  void clearCombinedID() => clearField(5);
+  void clearCombinedID() => $_clearField(5);
 }
 
 ///
@@ -2011,15 +2013,15 @@ class CombinedFilter extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasPath() => $_has(0);
   @$pb.TagNumber(1)
-  void clearPath() => clearField(1);
+  void clearPath() => $_clearField(1);
 
   /// Simple filter structure for Find query
   @$pb.TagNumber(2)
-  $core.List<SimpleFilter> get simpleFilters => $_getList(1);
+  $pb.PbList<SimpleFilter> get simpleFilters => $_getList(1);
 
   /// Range filter structure for Find query
   @$pb.TagNumber(3)
-  $core.List<RangeFilter> get rangeFilters => $_getList(2);
+  $pb.PbList<RangeFilter> get rangeFilters => $_getList(2);
 
   @$pb.TagNumber(4)
   $core.String get combinedID => $_getSZ(3);
@@ -2028,7 +2030,7 @@ class CombinedFilter extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasCombinedID() => $_has(3);
   @$pb.TagNumber(4)
-  void clearCombinedID() => clearField(4);
+  void clearCombinedID() => $_clearField(4);
 }
 
 /// Filter between two values
@@ -2095,7 +2097,7 @@ class RangeFilter extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasAttribute() => $_has(0);
   @$pb.TagNumber(1)
-  void clearAttribute() => clearField(1);
+  void clearAttribute() => $_clearField(1);
 
   /// Maximum value
   @$pb.TagNumber(2)
@@ -2105,7 +2107,7 @@ class RangeFilter extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasValueLt() => $_has(1);
   @$pb.TagNumber(2)
-  void clearValueLt() => clearField(2);
+  void clearValueLt() => $_clearField(2);
 
   /// Minimum value
   @$pb.TagNumber(3)
@@ -2115,7 +2117,7 @@ class RangeFilter extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasValueGt() => $_has(2);
   @$pb.TagNumber(3)
-  void clearValueGt() => clearField(3);
+  void clearValueGt() => $_clearField(3);
 
   /// Metadata's key
   @$pb.TagNumber(4)
@@ -2125,7 +2127,7 @@ class RangeFilter extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasCombinedID() => $_has(3);
   @$pb.TagNumber(4)
-  void clearCombinedID() => clearField(4);
+  void clearCombinedID() => $_clearField(4);
 }
 
 ///
@@ -2182,15 +2184,15 @@ class BlockFilter extends $pb.GeneratedMessage {
 
   /// Simple filter structure for Find query
   @$pb.TagNumber(1)
-  $core.List<SimpleFilter> get simpleFilters => $_getList(0);
+  $pb.PbList<SimpleFilter> get simpleFilters => $_getList(0);
 
   /// Range filter structure for Find query
   @$pb.TagNumber(2)
-  $core.List<RangeFilter> get rangeFilters => $_getList(1);
+  $pb.PbList<RangeFilter> get rangeFilters => $_getList(1);
 
   /// block filter structure for Find query
   @$pb.TagNumber(3)
-  $core.List<BlockFilter> get blockFilters => $_getList(2);
+  $pb.PbList<BlockFilter> get blockFilters => $_getList(2);
 }
 
 ///
@@ -2252,7 +2254,7 @@ class MatchField extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasAttribute() => $_has(0);
   @$pb.TagNumber(1)
-  void clearAttribute() => clearField(1);
+  void clearAttribute() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get attributeCombined => $_getSZ(1);
@@ -2261,7 +2263,7 @@ class MatchField extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasAttributeCombined() => $_has(1);
   @$pb.TagNumber(2)
-  void clearAttributeCombined() => clearField(2);
+  void clearAttributeCombined() => $_clearField(2);
 
   @$pb.TagNumber(3)
   $core.String get combinedID => $_getSZ(2);
@@ -2270,7 +2272,7 @@ class MatchField extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasCombinedID() => $_has(2);
   @$pb.TagNumber(3)
-  void clearCombinedID() => clearField(3);
+  void clearCombinedID() => $_clearField(3);
 }
 
 ///
@@ -2327,7 +2329,7 @@ class ErrorDetail extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasKey() => $_has(0);
   @$pb.TagNumber(1)
-  void clearKey() => clearField(1);
+  void clearKey() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get value => $_getSZ(1);
@@ -2336,7 +2338,7 @@ class ErrorDetail extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasValue() => $_has(1);
   @$pb.TagNumber(2)
-  void clearValue() => clearField(2);
+  void clearValue() => $_clearField(2);
 }
 
 ///
@@ -2413,7 +2415,7 @@ class Errors extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasErrorCode() => $_has(0);
   @$pb.TagNumber(1)
-  void clearErrorCode() => clearField(1);
+  void clearErrorCode() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get errorTrace => $_getSZ(1);
@@ -2422,10 +2424,10 @@ class Errors extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasErrorTrace() => $_has(1);
   @$pb.TagNumber(2)
-  void clearErrorTrace() => clearField(2);
+  void clearErrorTrace() => $_clearField(2);
 
   @$pb.TagNumber(3)
-  $core.List<ErrorDetail> get errorDetails => $_getList(2);
+  $pb.PbList<ErrorDetail> get errorDetails => $_getList(2);
 
   @$pb.TagNumber(4)
   $core.String get contextType => $_getSZ(3);
@@ -2434,7 +2436,7 @@ class Errors extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasContextType() => $_has(3);
   @$pb.TagNumber(4)
-  void clearContextType() => clearField(4);
+  void clearContextType() => $_clearField(4);
 
   @$pb.TagNumber(5)
   $core.String get contextProcess => $_getSZ(4);
@@ -2443,7 +2445,7 @@ class Errors extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $core.bool hasContextProcess() => $_has(4);
   @$pb.TagNumber(5)
-  void clearContextProcess() => clearField(5);
+  void clearContextProcess() => $_clearField(5);
 
   @$pb.TagNumber(6)
   $core.String get contextPayload => $_getSZ(5);
@@ -2452,7 +2454,7 @@ class Errors extends $pb.GeneratedMessage {
   @$pb.TagNumber(6)
   $core.bool hasContextPayload() => $_has(5);
   @$pb.TagNumber(6)
-  void clearContextPayload() => clearField(6);
+  void clearContextPayload() => $_clearField(6);
 }
 
 ///
@@ -2509,17 +2511,17 @@ class ParamElement extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasKey() => $_has(0);
   @$pb.TagNumber(1)
-  void clearKey() => clearField(1);
+  void clearKey() => $_clearField(1);
 
   /// string Value = 2;
   @$pb.TagNumber(3)
   ValueType get value => $_getN(1);
   @$pb.TagNumber(3)
-  set value(ValueType v) { setField(3, v); }
+  set value(ValueType v) { $_setField(3, v); }
   @$pb.TagNumber(3)
   $core.bool hasValue() => $_has(1);
   @$pb.TagNumber(3)
-  void clearValue() => clearField(3);
+  void clearValue() => $_clearField(3);
   @$pb.TagNumber(3)
   ValueType ensureValue() => $_ensure(1);
 }
@@ -2581,7 +2583,7 @@ class LabelStructure extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasCode() => $_has(0);
   @$pb.TagNumber(1)
-  void clearCode() => clearField(1);
+  void clearCode() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get label => $_getSZ(1);
@@ -2590,10 +2592,10 @@ class LabelStructure extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasLabel() => $_has(1);
   @$pb.TagNumber(2)
-  void clearLabel() => clearField(2);
+  void clearLabel() => $_clearField(2);
 
   @$pb.TagNumber(3)
-  $core.List<ParamElement> get params => $_getList(2);
+  $pb.PbList<ParamElement> get params => $_getList(2);
 }
 
 class Credentials extends $pb.GeneratedMessage {
@@ -2648,7 +2650,7 @@ class Credentials extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasJwt() => $_has(0);
   @$pb.TagNumber(1)
-  void clearJwt() => clearField(1);
+  void clearJwt() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get seed => $_getSZ(1);
@@ -2657,7 +2659,7 @@ class Credentials extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasSeed() => $_has(1);
   @$pb.TagNumber(2)
-  void clearSeed() => clearField(2);
+  void clearSeed() => $_clearField(2);
 }
 
 class Int32Object extends $pb.GeneratedMessage {
@@ -2707,7 +2709,7 @@ class Int32Object extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasInt32() => $_has(0);
   @$pb.TagNumber(1)
-  void clearInt32() => clearField(1);
+  void clearInt32() => $_clearField(1);
 }
 
 class BoolObject extends $pb.GeneratedMessage {
@@ -2757,7 +2759,7 @@ class BoolObject extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasBool_1() => $_has(0);
   @$pb.TagNumber(1)
-  void clearBool_1() => clearField(1);
+  void clearBool_1() => $_clearField(1);
 }
 
 class StringObject extends $pb.GeneratedMessage {
@@ -2807,7 +2809,7 @@ class StringObject extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasString() => $_has(0);
   @$pb.TagNumber(1)
-  void clearString() => clearField(1);
+  void clearString() => $_clearField(1);
 }
 
 class StringDateObject extends $pb.GeneratedMessage {
@@ -2858,7 +2860,7 @@ class StringDateObject extends $pb.GeneratedMessage {
   @$pb.TagNumber(10)
   $core.bool hasDateTime() => $_has(0);
   @$pb.TagNumber(10)
-  void clearDateTime() => clearField(10);
+  void clearDateTime() => $_clearField(10);
 }
 
 
diff --git a/lib/core/shared.pbenum.dart b/lib/core/shared.pbenum.dart
index bbd757e..c4ab87a 100644
--- a/lib/core/shared.pbenum.dart
+++ b/lib/core/shared.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: core/shared.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -37,7 +37,7 @@ class ResponseStatus extends $pb.ProtobufEnum {
   static final $core.Map<$core.int, ResponseStatus> _byValue = $pb.ProtobufEnum.initByValue(values);
   static ResponseStatus? valueOf($core.int value) => _byValue[value];
 
-  const ResponseStatus._($core.int v, $core.String n) : super(v, n);
+  const ResponseStatus._(super.v, super.n);
 }
 
 
diff --git a/lib/core/shared.pbjson.dart b/lib/core/shared.pbjson.dart
index e405c2c..7af7dc6 100644
--- a/lib/core/shared.pbjson.dart
+++ b/lib/core/shared.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: core/shared.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/core/unitOfMeasures.pb.dart b/lib/core/unitOfMeasures.pb.dart
index d6640c3..57963df 100644
--- a/lib/core/unitOfMeasures.pb.dart
+++ b/lib/core/unitOfMeasures.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: core/unitOfMeasures.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -13,6 +13,8 @@ import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 export 'unitOfMeasures.pbenum.dart';
 
 class UnitOfMeasures {
diff --git a/lib/core/unitOfMeasures.pbenum.dart b/lib/core/unitOfMeasures.pbenum.dart
index 38346db..ca72c51 100644
--- a/lib/core/unitOfMeasures.pbenum.dart
+++ b/lib/core/unitOfMeasures.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: core/unitOfMeasures.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -45,7 +45,7 @@ class Length extends $pb.ProtobufEnum {
   static final $core.Map<$core.int, Length> _byValue = $pb.ProtobufEnum.initByValue(values);
   static Length? valueOf($core.int value) => _byValue[value];
 
-  const Length._($core.int v, $core.String n) : super(v, n);
+  const Length._(super.v, super.n);
 }
 
 class Weight extends $pb.ProtobufEnum {
@@ -86,7 +86,7 @@ class Weight extends $pb.ProtobufEnum {
   static final $core.Map<$core.int, Weight> _byValue = $pb.ProtobufEnum.initByValue(values);
   static Weight? valueOf($core.int value) => _byValue[value];
 
-  const Weight._($core.int v, $core.String n) : super(v, n);
+  const Weight._(super.v, super.n);
 }
 
 class Temperature extends $pb.ProtobufEnum {
@@ -103,7 +103,7 @@ class Temperature extends $pb.ProtobufEnum {
   static final $core.Map<$core.int, Temperature> _byValue = $pb.ProtobufEnum.initByValue(values);
   static Temperature? valueOf($core.int value) => _byValue[value];
 
-  const Temperature._($core.int v, $core.String n) : super(v, n);
+  const Temperature._(super.v, super.n);
 }
 
 class Speed extends $pb.ProtobufEnum {
@@ -124,7 +124,7 @@ class Speed extends $pb.ProtobufEnum {
   static final $core.Map<$core.int, Speed> _byValue = $pb.ProtobufEnum.initByValue(values);
   static Speed? valueOf($core.int value) => _byValue[value];
 
-  const Speed._($core.int v, $core.String n) : super(v, n);
+  const Speed._(super.v, super.n);
 }
 
 class Area extends $pb.ProtobufEnum {
@@ -157,7 +157,7 @@ class Area extends $pb.ProtobufEnum {
   static final $core.Map<$core.int, Area> _byValue = $pb.ProtobufEnum.initByValue(values);
   static Area? valueOf($core.int value) => _byValue[value];
 
-  const Area._($core.int v, $core.String n) : super(v, n);
+  const Area._(super.v, super.n);
 }
 
 class Volume extends $pb.ProtobufEnum {
@@ -214,7 +214,7 @@ class Volume extends $pb.ProtobufEnum {
   static final $core.Map<$core.int, Volume> _byValue = $pb.ProtobufEnum.initByValue(values);
   static Volume? valueOf($core.int value) => _byValue[value];
 
-  const Volume._($core.int v, $core.String n) : super(v, n);
+  const Volume._(super.v, super.n);
 }
 
 class DimensionLess extends $pb.ProtobufEnum {
@@ -229,7 +229,7 @@ class DimensionLess extends $pb.ProtobufEnum {
   static final $core.Map<$core.int, DimensionLess> _byValue = $pb.ProtobufEnum.initByValue(values);
   static DimensionLess? valueOf($core.int value) => _byValue[value];
 
-  const DimensionLess._($core.int v, $core.String n) : super(v, n);
+  const DimensionLess._(super.v, super.n);
 }
 
 
diff --git a/lib/core/unitOfMeasures.pbjson.dart b/lib/core/unitOfMeasures.pbjson.dart
index 979c4c7..8cff2e8 100644
--- a/lib/core/unitOfMeasures.pbjson.dart
+++ b/lib/core/unitOfMeasures.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: core/unitOfMeasures.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/counter.pb.dart b/lib/counter.pb.dart
index d84697d..6b1b29e 100644
--- a/lib/counter.pb.dart
+++ b/lib/counter.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: counter.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -16,6 +16,8 @@ import 'package:protobuf/protobuf.dart' as $pb;
 
 import 'core/shared.pb.dart' as $16;
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 class NextProjectCounterRequest extends $pb.GeneratedMessage {
   factory NextProjectCounterRequest({
     $16.RequestProjectHeader? header,
@@ -64,11 +66,11 @@ class NextProjectCounterRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $16.RequestProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($16.RequestProjectHeader v) { setField(1, v); }
+  set header($16.RequestProjectHeader v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
-  void clearHeader() => clearField(1);
+  void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
   $16.RequestProjectHeader ensureHeader() => $_ensure(0);
 
@@ -79,7 +81,7 @@ class NextProjectCounterRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasKey() => $_has(1);
   @$pb.TagNumber(2)
-  void clearKey() => clearField(2);
+  void clearKey() => $_clearField(2);
 }
 
 class NextCounterResult extends $pb.GeneratedMessage {
@@ -129,7 +131,7 @@ class NextCounterResult extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasValue() => $_has(0);
   @$pb.TagNumber(1)
-  void clearValue() => clearField(1);
+  void clearValue() => $_clearField(1);
 }
 
 
diff --git a/lib/counter.pbenum.dart b/lib/counter.pbenum.dart
index 766e7b7..c491579 100644
--- a/lib/counter.pbenum.dart
+++ b/lib/counter.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: counter.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/counter.pbgrpc.dart b/lib/counter.pbgrpc.dart
index 5a20259..0fdb153 100644
--- a/lib/counter.pbgrpc.dart
+++ b/lib/counter.pbgrpc.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: counter.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -51,8 +51,8 @@ abstract class ProjectCountersServiceBase extends $grpc.Service {
         ($9.NextCounterResult value) => value.writeToBuffer()));
   }
 
-  $async.Future<$9.NextCounterResult> next_Pre($grpc.ServiceCall call, $async.Future<$9.NextProjectCounterRequest> request) async {
-    return next(call, await request);
+  $async.Future<$9.NextCounterResult> next_Pre($grpc.ServiceCall $call, $async.Future<$9.NextProjectCounterRequest> $request) async {
+    return next($call, await $request);
   }
 
   $async.Future<$9.NextCounterResult> next($grpc.ServiceCall call, $9.NextProjectCounterRequest request);
diff --git a/lib/counter.pbjson.dart b/lib/counter.pbjson.dart
index d808028..51b239d 100644
--- a/lib/counter.pbjson.dart
+++ b/lib/counter.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: counter.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/google/api/annotations.pb.dart b/lib/google/api/annotations.pb.dart
index 9c0434b..9780e2e 100644
--- a/lib/google/api/annotations.pb.dart
+++ b/lib/google/api/annotations.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/api/annotations.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -15,6 +15,8 @@ import 'package:protobuf/protobuf.dart' as $pb;
 
 import 'http.pb.dart' as $21;
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 class Annotations {
   static final http = $pb.Extension<$21.HttpRule>(_omitMessageNames ? '' : 'google.protobuf.MethodOptions', _omitFieldNames ? '' : 'http', 72295728, $pb.PbFieldType.OM, defaultOrMaker: $21.HttpRule.getDefault, subBuilder: $21.HttpRule.create);
   static void registerAllExtensions($pb.ExtensionRegistry registry) {
diff --git a/lib/google/api/annotations.pbenum.dart b/lib/google/api/annotations.pbenum.dart
index 7721604..ccf434c 100644
--- a/lib/google/api/annotations.pbenum.dart
+++ b/lib/google/api/annotations.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/api/annotations.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/google/api/annotations.pbjson.dart b/lib/google/api/annotations.pbjson.dart
index 552ee2b..02af40d 100644
--- a/lib/google/api/annotations.pbjson.dart
+++ b/lib/google/api/annotations.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/api/annotations.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/google/api/field_behavior.pb.dart b/lib/google/api/field_behavior.pb.dart
index 81c3c0c..22f52fc 100644
--- a/lib/google/api/field_behavior.pb.dart
+++ b/lib/google/api/field_behavior.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/api/field_behavior.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -15,6 +15,8 @@ import 'package:protobuf/protobuf.dart' as $pb;
 
 import 'field_behavior.pbenum.dart';
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 export 'field_behavior.pbenum.dart';
 
 class Field_behavior {
diff --git a/lib/google/api/field_behavior.pbenum.dart b/lib/google/api/field_behavior.pbenum.dart
index 9014436..a9b125c 100644
--- a/lib/google/api/field_behavior.pbenum.dart
+++ b/lib/google/api/field_behavior.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/api/field_behavior.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -20,11 +20,28 @@ import 'package:protobuf/protobuf.dart' as $pb;
 ///
 ///  Note: This enum **may** receive new values in the future.
 class FieldBehavior extends $pb.ProtobufEnum {
+  /// Conventional default for enums. Do not use this.
   static const FieldBehavior FIELD_BEHAVIOR_UNSPECIFIED = FieldBehavior._(0, _omitEnumNames ? '' : 'FIELD_BEHAVIOR_UNSPECIFIED');
+  /// Specifically denotes a field as optional.
+  /// While all fields in protocol buffers are optional, this may be specified
+  /// for emphasis if appropriate.
   static const FieldBehavior OPTIONAL = FieldBehavior._(1, _omitEnumNames ? '' : 'OPTIONAL');
+  /// Denotes a field as required.
+  /// This indicates that the field **must** be provided as part of the request,
+  /// and failure to do so will cause an error (usually `INVALID_ARGUMENT`).
   static const FieldBehavior REQUIRED = FieldBehavior._(2, _omitEnumNames ? '' : 'REQUIRED');
+  /// Denotes a field as output only.
+  /// This indicates that the field is provided in responses, but including the
+  /// field in a request does nothing (the server *must* ignore it and
+  /// *must not* throw an error as a result of the field's presence).
   static const FieldBehavior OUTPUT_ONLY = FieldBehavior._(3, _omitEnumNames ? '' : 'OUTPUT_ONLY');
+  /// Denotes a field as input only.
+  /// This indicates that the field is provided in requests, and the
+  /// corresponding field is not included in output.
   static const FieldBehavior INPUT_ONLY = FieldBehavior._(4, _omitEnumNames ? '' : 'INPUT_ONLY');
+  /// Denotes a field as immutable.
+  /// This indicates that the field may be set once in a request to create a
+  /// resource, but may not be changed thereafter.
   static const FieldBehavior IMMUTABLE = FieldBehavior._(5, _omitEnumNames ? '' : 'IMMUTABLE');
 
   static const $core.List<FieldBehavior> values = <FieldBehavior> [
@@ -39,7 +56,7 @@ class FieldBehavior extends $pb.ProtobufEnum {
   static final $core.Map<$core.int, FieldBehavior> _byValue = $pb.ProtobufEnum.initByValue(values);
   static FieldBehavior? valueOf($core.int value) => _byValue[value];
 
-  const FieldBehavior._($core.int v, $core.String n) : super(v, n);
+  const FieldBehavior._(super.v, super.n);
 }
 
 
diff --git a/lib/google/api/field_behavior.pbjson.dart b/lib/google/api/field_behavior.pbjson.dart
index b2a9386..7e4fc28 100644
--- a/lib/google/api/field_behavior.pbjson.dart
+++ b/lib/google/api/field_behavior.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/api/field_behavior.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/google/api/http.pb.dart b/lib/google/api/http.pb.dart
index feb4245..42912a3 100644
--- a/lib/google/api/http.pb.dart
+++ b/lib/google/api/http.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/api/http.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -13,6 +13,8 @@ import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 /// Defines the HTTP configuration for an API service. It contains a list of
 /// [HttpRule][google.api.HttpRule], each specifying the mapping of an RPC method
 /// to one or more HTTP REST API methods.
@@ -65,7 +67,7 @@ class Http extends $pb.GeneratedMessage {
   ///
   ///  **NOTE:** All service configuration rules follow "last one wins" order.
   @$pb.TagNumber(1)
-  $core.List<HttpRule> get rules => $_getList(0);
+  $pb.PbList<HttpRule> get rules => $_getList(0);
 
   ///  When set to true, URL path parameters will be fully URI-decoded except in
   ///  cases of single segment matches in reserved expansion, where "%2F" will be
@@ -80,7 +82,7 @@ class Http extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasFullyDecodeReservedExpansion() => $_has(1);
   @$pb.TagNumber(2)
-  void clearFullyDecodeReservedExpansion() => clearField(2);
+  void clearFullyDecodeReservedExpansion() => $_clearField(2);
 }
 
 enum HttpRule_Pattern {
@@ -458,7 +460,7 @@ class HttpRule extends $pb.GeneratedMessage {
   static HttpRule? _defaultInstance;
 
   HttpRule_Pattern whichPattern() => _HttpRule_PatternByTag[$_whichOneof(0)]!;
-  void clearPattern() => clearField($_whichOneof(0));
+  void clearPattern() => $_clearField($_whichOneof(0));
 
   ///  Selects a method to which this rule applies.
   ///
@@ -470,7 +472,7 @@ class HttpRule extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasSelector() => $_has(0);
   @$pb.TagNumber(1)
-  void clearSelector() => clearField(1);
+  void clearSelector() => $_clearField(1);
 
   /// Maps to HTTP GET. Used for listing and getting information about
   /// resources.
@@ -481,7 +483,7 @@ class HttpRule extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasGet() => $_has(1);
   @$pb.TagNumber(2)
-  void clearGet() => clearField(2);
+  void clearGet() => $_clearField(2);
 
   /// Maps to HTTP PUT. Used for replacing a resource.
   @$pb.TagNumber(3)
@@ -491,7 +493,7 @@ class HttpRule extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasPut() => $_has(2);
   @$pb.TagNumber(3)
-  void clearPut() => clearField(3);
+  void clearPut() => $_clearField(3);
 
   /// Maps to HTTP POST. Used for creating a resource or performing an action.
   @$pb.TagNumber(4)
@@ -501,7 +503,7 @@ class HttpRule extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasPost() => $_has(3);
   @$pb.TagNumber(4)
-  void clearPost() => clearField(4);
+  void clearPost() => $_clearField(4);
 
   /// Maps to HTTP DELETE. Used for deleting a resource.
   @$pb.TagNumber(5)
@@ -511,7 +513,7 @@ class HttpRule extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $core.bool hasDelete() => $_has(4);
   @$pb.TagNumber(5)
-  void clearDelete() => clearField(5);
+  void clearDelete() => $_clearField(5);
 
   /// Maps to HTTP PATCH. Used for updating a resource.
   @$pb.TagNumber(6)
@@ -521,7 +523,7 @@ class HttpRule extends $pb.GeneratedMessage {
   @$pb.TagNumber(6)
   $core.bool hasPatch() => $_has(5);
   @$pb.TagNumber(6)
-  void clearPatch() => clearField(6);
+  void clearPatch() => $_clearField(6);
 
   ///  The name of the request field whose value is mapped to the HTTP request
   ///  body, or `*` for mapping all request fields not captured by the path
@@ -536,7 +538,7 @@ class HttpRule extends $pb.GeneratedMessage {
   @$pb.TagNumber(7)
   $core.bool hasBody() => $_has(6);
   @$pb.TagNumber(7)
-  void clearBody() => clearField(7);
+  void clearBody() => $_clearField(7);
 
   /// The custom pattern is used for specifying an HTTP method that is not
   /// included in the `pattern` field, such as HEAD, or "*" to leave the
@@ -545,11 +547,11 @@ class HttpRule extends $pb.GeneratedMessage {
   @$pb.TagNumber(8)
   CustomHttpPattern get custom => $_getN(7);
   @$pb.TagNumber(8)
-  set custom(CustomHttpPattern v) { setField(8, v); }
+  set custom(CustomHttpPattern v) { $_setField(8, v); }
   @$pb.TagNumber(8)
   $core.bool hasCustom() => $_has(7);
   @$pb.TagNumber(8)
-  void clearCustom() => clearField(8);
+  void clearCustom() => $_clearField(8);
   @$pb.TagNumber(8)
   CustomHttpPattern ensureCustom() => $_ensure(7);
 
@@ -557,7 +559,7 @@ class HttpRule extends $pb.GeneratedMessage {
   /// not contain an `additional_bindings` field themselves (that is,
   /// the nesting may only be one level deep).
   @$pb.TagNumber(11)
-  $core.List<HttpRule> get additionalBindings => $_getList(8);
+  $pb.PbList<HttpRule> get additionalBindings => $_getList(8);
 
   ///  Optional. The name of the response field whose value is mapped to the HTTP
   ///  response body. When omitted, the entire response message will be used
@@ -572,7 +574,7 @@ class HttpRule extends $pb.GeneratedMessage {
   @$pb.TagNumber(12)
   $core.bool hasResponseBody() => $_has(9);
   @$pb.TagNumber(12)
-  void clearResponseBody() => clearField(12);
+  void clearResponseBody() => $_clearField(12);
 }
 
 /// A custom pattern is used for defining custom HTTP verb.
@@ -629,7 +631,7 @@ class CustomHttpPattern extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasKind() => $_has(0);
   @$pb.TagNumber(1)
-  void clearKind() => clearField(1);
+  void clearKind() => $_clearField(1);
 
   /// The path matched by this custom verb.
   @$pb.TagNumber(2)
@@ -639,7 +641,7 @@ class CustomHttpPattern extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasPath() => $_has(1);
   @$pb.TagNumber(2)
-  void clearPath() => clearField(2);
+  void clearPath() => $_clearField(2);
 }
 
 
diff --git a/lib/google/api/http.pbenum.dart b/lib/google/api/http.pbenum.dart
index 85231f7..e1e7506 100644
--- a/lib/google/api/http.pbenum.dart
+++ b/lib/google/api/http.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/api/http.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/google/api/http.pbjson.dart b/lib/google/api/http.pbjson.dart
index e802c05..c40c0a5 100644
--- a/lib/google/api/http.pbjson.dart
+++ b/lib/google/api/http.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/api/http.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/google/api/httpbody.pb.dart b/lib/google/api/httpbody.pb.dart
index 5881587..a3984e2 100644
--- a/lib/google/api/httpbody.pb.dart
+++ b/lib/google/api/httpbody.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/api/httpbody.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -15,6 +15,8 @@ import 'package:protobuf/protobuf.dart' as $pb;
 
 import '../protobuf/any.pb.dart' as $17;
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 ///  Message that represents an arbitrary HTTP body. It should only be used for
 ///  payload formats that can't be represented as JSON, such as raw binary or
 ///  an HTML page.
@@ -112,7 +114,7 @@ class HttpBody extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasContentType() => $_has(0);
   @$pb.TagNumber(1)
-  void clearContentType() => clearField(1);
+  void clearContentType() => $_clearField(1);
 
   /// The HTTP request/response body as raw binary.
   @$pb.TagNumber(2)
@@ -122,12 +124,12 @@ class HttpBody extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasData() => $_has(1);
   @$pb.TagNumber(2)
-  void clearData() => clearField(2);
+  void clearData() => $_clearField(2);
 
   /// Application specific response metadata. Must be set in the first response
   /// for streaming APIs.
   @$pb.TagNumber(3)
-  $core.List<$17.Any> get extensions => $_getList(2);
+  $pb.PbList<$17.Any> get extensions => $_getList(2);
 }
 
 
diff --git a/lib/google/api/httpbody.pbenum.dart b/lib/google/api/httpbody.pbenum.dart
index addee6f..e725519 100644
--- a/lib/google/api/httpbody.pbenum.dart
+++ b/lib/google/api/httpbody.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/api/httpbody.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/google/api/httpbody.pbjson.dart b/lib/google/api/httpbody.pbjson.dart
index 1ab1198..ac432f1 100644
--- a/lib/google/api/httpbody.pbjson.dart
+++ b/lib/google/api/httpbody.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/api/httpbody.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/google/protobuf/any.pb.dart b/lib/google/protobuf/any.pb.dart
index ab31d10..05212b9 100644
--- a/lib/google/protobuf/any.pb.dart
+++ b/lib/google/protobuf/any.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/any.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -14,6 +14,8 @@ import 'dart:core' as $core;
 import 'package:protobuf/protobuf.dart' as $pb;
 import 'package:protobuf/src/protobuf/mixins/well_known.dart' as $mixin;
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 ///  `Any` contains an arbitrary serialized protocol buffer message along with a
 ///  URL that describes the type of the serialized message.
 ///
@@ -172,7 +174,7 @@ class Any extends $pb.GeneratedMessage with $mixin.AnyMixin {
   @$pb.TagNumber(1)
   $core.bool hasTypeUrl() => $_has(0);
   @$pb.TagNumber(1)
-  void clearTypeUrl() => clearField(1);
+  void clearTypeUrl() => $_clearField(1);
 
   /// Must be a valid serialized protocol buffer of the above specified type.
   @$pb.TagNumber(2)
@@ -182,7 +184,7 @@ class Any extends $pb.GeneratedMessage with $mixin.AnyMixin {
   @$pb.TagNumber(2)
   $core.bool hasValue() => $_has(1);
   @$pb.TagNumber(2)
-  void clearValue() => clearField(2);
+  void clearValue() => $_clearField(2);
   /// Creates a new [Any] encoding [message].
   ///
   /// The [typeUrl] will be [typeUrlPrefix]/`fullName` where `fullName` is
diff --git a/lib/google/protobuf/any.pbenum.dart b/lib/google/protobuf/any.pbenum.dart
index effdb47..fd3fb80 100644
--- a/lib/google/protobuf/any.pbenum.dart
+++ b/lib/google/protobuf/any.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/any.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/google/protobuf/any.pbjson.dart b/lib/google/protobuf/any.pbjson.dart
index beaeb5f..98ad03a 100644
--- a/lib/google/protobuf/any.pbjson.dart
+++ b/lib/google/protobuf/any.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/any.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/google/protobuf/api.pb.dart b/lib/google/protobuf/api.pb.dart
index 0e0a155..e1eaf17 100644
--- a/lib/google/protobuf/api.pb.dart
+++ b/lib/google/protobuf/api.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/api.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -17,6 +17,8 @@ import 'source_context.pb.dart' as $18;
 import 'type.pb.dart' as $20;
 import 'type.pbenum.dart' as $20;
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 ///  Api is a light-weight descriptor for an API Interface.
 ///
 ///  Interfaces are also described as "protocol buffer services" in some contexts,
@@ -105,15 +107,15 @@ class Api extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasName() => $_has(0);
   @$pb.TagNumber(1)
-  void clearName() => clearField(1);
+  void clearName() => $_clearField(1);
 
   /// The methods of this interface, in unspecified order.
   @$pb.TagNumber(2)
-  $core.List<Method> get methods => $_getList(1);
+  $pb.PbList<Method> get methods => $_getList(1);
 
   /// Any metadata attached to the interface.
   @$pb.TagNumber(3)
-  $core.List<$20.Option> get options => $_getList(2);
+  $pb.PbList<$20.Option> get options => $_getList(2);
 
   ///  A version string for this interface. If specified, must have the form
   ///  `major-version.minor-version`, as in `1.10`. If the minor version is
@@ -141,34 +143,34 @@ class Api extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasVersion() => $_has(3);
   @$pb.TagNumber(4)
-  void clearVersion() => clearField(4);
+  void clearVersion() => $_clearField(4);
 
   /// Source context for the protocol buffer service represented by this
   /// message.
   @$pb.TagNumber(5)
   $18.SourceContext get sourceContext => $_getN(4);
   @$pb.TagNumber(5)
-  set sourceContext($18.SourceContext v) { setField(5, v); }
+  set sourceContext($18.SourceContext v) { $_setField(5, v); }
   @$pb.TagNumber(5)
   $core.bool hasSourceContext() => $_has(4);
   @$pb.TagNumber(5)
-  void clearSourceContext() => clearField(5);
+  void clearSourceContext() => $_clearField(5);
   @$pb.TagNumber(5)
   $18.SourceContext ensureSourceContext() => $_ensure(4);
 
   /// Included interfaces. See [Mixin][].
   @$pb.TagNumber(6)
-  $core.List<Mixin> get mixins => $_getList(5);
+  $pb.PbList<Mixin> get mixins => $_getList(5);
 
   /// The source syntax of the service.
   @$pb.TagNumber(7)
   $20.Syntax get syntax => $_getN(6);
   @$pb.TagNumber(7)
-  set syntax($20.Syntax v) { setField(7, v); }
+  set syntax($20.Syntax v) { $_setField(7, v); }
   @$pb.TagNumber(7)
   $core.bool hasSyntax() => $_has(6);
   @$pb.TagNumber(7)
-  void clearSyntax() => clearField(7);
+  void clearSyntax() => $_clearField(7);
 }
 
 /// Method represents a method of an API interface.
@@ -250,7 +252,7 @@ class Method extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasName() => $_has(0);
   @$pb.TagNumber(1)
-  void clearName() => clearField(1);
+  void clearName() => $_clearField(1);
 
   /// A URL of the input message type.
   @$pb.TagNumber(2)
@@ -260,7 +262,7 @@ class Method extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasRequestTypeUrl() => $_has(1);
   @$pb.TagNumber(2)
-  void clearRequestTypeUrl() => clearField(2);
+  void clearRequestTypeUrl() => $_clearField(2);
 
   /// If true, the request is streamed.
   @$pb.TagNumber(3)
@@ -270,7 +272,7 @@ class Method extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasRequestStreaming() => $_has(2);
   @$pb.TagNumber(3)
-  void clearRequestStreaming() => clearField(3);
+  void clearRequestStreaming() => $_clearField(3);
 
   /// The URL of the output message type.
   @$pb.TagNumber(4)
@@ -280,7 +282,7 @@ class Method extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasResponseTypeUrl() => $_has(3);
   @$pb.TagNumber(4)
-  void clearResponseTypeUrl() => clearField(4);
+  void clearResponseTypeUrl() => $_clearField(4);
 
   /// If true, the response is streamed.
   @$pb.TagNumber(5)
@@ -290,21 +292,21 @@ class Method extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $core.bool hasResponseStreaming() => $_has(4);
   @$pb.TagNumber(5)
-  void clearResponseStreaming() => clearField(5);
+  void clearResponseStreaming() => $_clearField(5);
 
   /// Any metadata attached to the method.
   @$pb.TagNumber(6)
-  $core.List<$20.Option> get options => $_getList(5);
+  $pb.PbList<$20.Option> get options => $_getList(5);
 
   /// The source syntax of this method.
   @$pb.TagNumber(7)
   $20.Syntax get syntax => $_getN(6);
   @$pb.TagNumber(7)
-  set syntax($20.Syntax v) { setField(7, v); }
+  set syntax($20.Syntax v) { $_setField(7, v); }
   @$pb.TagNumber(7)
   $core.bool hasSyntax() => $_has(6);
   @$pb.TagNumber(7)
-  void clearSyntax() => clearField(7);
+  void clearSyntax() => $_clearField(7);
 }
 
 ///  Declares an API Interface to be included in this interface. The including
@@ -438,7 +440,7 @@ class Mixin extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasName() => $_has(0);
   @$pb.TagNumber(1)
-  void clearName() => clearField(1);
+  void clearName() => $_clearField(1);
 
   /// If non-empty specifies a path under which inherited HTTP paths
   /// are rooted.
@@ -449,7 +451,7 @@ class Mixin extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasRoot() => $_has(1);
   @$pb.TagNumber(2)
-  void clearRoot() => clearField(2);
+  void clearRoot() => $_clearField(2);
 }
 
 
diff --git a/lib/google/protobuf/api.pbenum.dart b/lib/google/protobuf/api.pbenum.dart
index 9b4a6b5..765038b 100644
--- a/lib/google/protobuf/api.pbenum.dart
+++ b/lib/google/protobuf/api.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/api.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/google/protobuf/api.pbjson.dart b/lib/google/protobuf/api.pbjson.dart
index d6b30eb..4569d55 100644
--- a/lib/google/protobuf/api.pbjson.dart
+++ b/lib/google/protobuf/api.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/api.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/google/protobuf/compiler/plugin.pb.dart b/lib/google/protobuf/compiler/plugin.pb.dart
index 711bc37..f9b1ba2 100644
--- a/lib/google/protobuf/compiler/plugin.pb.dart
+++ b/lib/google/protobuf/compiler/plugin.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/compiler/plugin.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -15,6 +15,8 @@ import 'package:protobuf/protobuf.dart' as $pb;
 
 import '../descriptor.pb.dart' as $19;
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 /// The version number of protocol compiler.
 class Version extends $pb.GeneratedMessage {
   factory Version({
@@ -78,7 +80,7 @@ class Version extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasMajor() => $_has(0);
   @$pb.TagNumber(1)
-  void clearMajor() => clearField(1);
+  void clearMajor() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.int get minor => $_getIZ(1);
@@ -87,7 +89,7 @@ class Version extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasMinor() => $_has(1);
   @$pb.TagNumber(2)
-  void clearMinor() => clearField(2);
+  void clearMinor() => $_clearField(2);
 
   @$pb.TagNumber(3)
   $core.int get patch => $_getIZ(2);
@@ -96,7 +98,7 @@ class Version extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasPatch() => $_has(2);
   @$pb.TagNumber(3)
-  void clearPatch() => clearField(3);
+  void clearPatch() => $_clearField(3);
 
   /// A suffix for alpha, beta or rc release, e.g., "alpha-1", "rc2". It should
   /// be empty for mainline stable releases.
@@ -107,7 +109,7 @@ class Version extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasSuffix() => $_has(3);
   @$pb.TagNumber(4)
-  void clearSuffix() => clearField(4);
+  void clearSuffix() => $_clearField(4);
 }
 
 /// An encoded CodeGeneratorRequest is written to the plugin's stdin.
@@ -169,7 +171,7 @@ class CodeGeneratorRequest extends $pb.GeneratedMessage {
   /// code generator should generate code only for these files.  Each file's
   /// descriptor will be included in proto_file, below.
   @$pb.TagNumber(1)
-  $core.List<$core.String> get fileToGenerate => $_getList(0);
+  $pb.PbList<$core.String> get fileToGenerate => $_getList(0);
 
   /// The generator parameter passed on the command-line.
   @$pb.TagNumber(2)
@@ -179,17 +181,17 @@ class CodeGeneratorRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasParameter() => $_has(1);
   @$pb.TagNumber(2)
-  void clearParameter() => clearField(2);
+  void clearParameter() => $_clearField(2);
 
   /// The version number of protocol compiler.
   @$pb.TagNumber(3)
   Version get compilerVersion => $_getN(2);
   @$pb.TagNumber(3)
-  set compilerVersion(Version v) { setField(3, v); }
+  set compilerVersion(Version v) { $_setField(3, v); }
   @$pb.TagNumber(3)
   $core.bool hasCompilerVersion() => $_has(2);
   @$pb.TagNumber(3)
-  void clearCompilerVersion() => clearField(3);
+  void clearCompilerVersion() => $_clearField(3);
   @$pb.TagNumber(3)
   Version ensureCompilerVersion() => $_ensure(2);
 
@@ -208,7 +210,7 @@ class CodeGeneratorRequest extends $pb.GeneratedMessage {
   ///  Type names of fields and extensions in the FileDescriptorProto are always
   ///  fully qualified.
   @$pb.TagNumber(15)
-  $core.List<$19.FileDescriptorProto> get protoFile => $_getList(3);
+  $pb.PbList<$19.FileDescriptorProto> get protoFile => $_getList(3);
 }
 
 /// Represents a single generated file.
@@ -280,7 +282,7 @@ class CodeGeneratorResponse_File extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasName() => $_has(0);
   @$pb.TagNumber(1)
-  void clearName() => clearField(1);
+  void clearName() => $_clearField(1);
 
   ///  If non-empty, indicates that the named file should already exist, and the
   ///  content here is to be inserted into that file at a defined insertion
@@ -326,7 +328,7 @@ class CodeGeneratorResponse_File extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasInsertionPoint() => $_has(1);
   @$pb.TagNumber(2)
-  void clearInsertionPoint() => clearField(2);
+  void clearInsertionPoint() => $_clearField(2);
 
   /// The file contents.
   @$pb.TagNumber(15)
@@ -336,7 +338,7 @@ class CodeGeneratorResponse_File extends $pb.GeneratedMessage {
   @$pb.TagNumber(15)
   $core.bool hasContent() => $_has(2);
   @$pb.TagNumber(15)
-  void clearContent() => clearField(15);
+  void clearContent() => $_clearField(15);
 }
 
 /// The plugin writes an encoded CodeGeneratorResponse to stdout.
@@ -400,10 +402,10 @@ class CodeGeneratorResponse extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasError() => $_has(0);
   @$pb.TagNumber(1)
-  void clearError() => clearField(1);
+  void clearError() => $_clearField(1);
 
   @$pb.TagNumber(15)
-  $core.List<CodeGeneratorResponse_File> get file => $_getList(1);
+  $pb.PbList<CodeGeneratorResponse_File> get file => $_getList(1);
 }
 
 
diff --git a/lib/google/protobuf/compiler/plugin.pbenum.dart b/lib/google/protobuf/compiler/plugin.pbenum.dart
index d39f38e..f4290fe 100644
--- a/lib/google/protobuf/compiler/plugin.pbenum.dart
+++ b/lib/google/protobuf/compiler/plugin.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/compiler/plugin.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/google/protobuf/compiler/plugin.pbjson.dart b/lib/google/protobuf/compiler/plugin.pbjson.dart
index 7c33e24..aeb4594 100644
--- a/lib/google/protobuf/compiler/plugin.pbjson.dart
+++ b/lib/google/protobuf/compiler/plugin.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/compiler/plugin.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/google/protobuf/descriptor.pb.dart b/lib/google/protobuf/descriptor.pb.dart
index 4f4684e..bf86d95 100644
--- a/lib/google/protobuf/descriptor.pb.dart
+++ b/lib/google/protobuf/descriptor.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/descriptor.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -16,6 +16,8 @@ import 'package:protobuf/protobuf.dart' as $pb;
 
 import 'descriptor.pbenum.dart';
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 export 'descriptor.pbenum.dart';
 
 /// The protocol compiler can output a FileDescriptorSet containing the .proto
@@ -60,7 +62,7 @@ class FileDescriptorSet extends $pb.GeneratedMessage {
   static FileDescriptorSet? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $core.List<FileDescriptorProto> get file => $_getList(0);
+  $pb.PbList<FileDescriptorProto> get file => $_getList(0);
 }
 
 /// Describes a complete .proto file.
@@ -165,7 +167,7 @@ class FileDescriptorProto extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasName() => $_has(0);
   @$pb.TagNumber(1)
-  void clearName() => clearField(1);
+  void clearName() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get package => $_getSZ(1);
@@ -174,33 +176,33 @@ class FileDescriptorProto extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasPackage() => $_has(1);
   @$pb.TagNumber(2)
-  void clearPackage() => clearField(2);
+  void clearPackage() => $_clearField(2);
 
   /// Names of files imported by this file.
   @$pb.TagNumber(3)
-  $core.List<$core.String> get dependency => $_getList(2);
+  $pb.PbList<$core.String> get dependency => $_getList(2);
 
   /// All top-level definitions in this file.
   @$pb.TagNumber(4)
-  $core.List<DescriptorProto> get messageType => $_getList(3);
+  $pb.PbList<DescriptorProto> get messageType => $_getList(3);
 
   @$pb.TagNumber(5)
-  $core.List<EnumDescriptorProto> get enumType => $_getList(4);
+  $pb.PbList<EnumDescriptorProto> get enumType => $_getList(4);
 
   @$pb.TagNumber(6)
-  $core.List<ServiceDescriptorProto> get service => $_getList(5);
+  $pb.PbList<ServiceDescriptorProto> get service => $_getList(5);
 
   @$pb.TagNumber(7)
-  $core.List<FieldDescriptorProto> get extension => $_getList(6);
+  $pb.PbList<FieldDescriptorProto> get extension => $_getList(6);
 
   @$pb.TagNumber(8)
   FileOptions get options => $_getN(7);
   @$pb.TagNumber(8)
-  set options(FileOptions v) { setField(8, v); }
+  set options(FileOptions v) { $_setField(8, v); }
   @$pb.TagNumber(8)
   $core.bool hasOptions() => $_has(7);
   @$pb.TagNumber(8)
-  void clearOptions() => clearField(8);
+  void clearOptions() => $_clearField(8);
   @$pb.TagNumber(8)
   FileOptions ensureOptions() => $_ensure(7);
 
@@ -211,22 +213,22 @@ class FileDescriptorProto extends $pb.GeneratedMessage {
   @$pb.TagNumber(9)
   SourceCodeInfo get sourceCodeInfo => $_getN(8);
   @$pb.TagNumber(9)
-  set sourceCodeInfo(SourceCodeInfo v) { setField(9, v); }
+  set sourceCodeInfo(SourceCodeInfo v) { $_setField(9, v); }
   @$pb.TagNumber(9)
   $core.bool hasSourceCodeInfo() => $_has(8);
   @$pb.TagNumber(9)
-  void clearSourceCodeInfo() => clearField(9);
+  void clearSourceCodeInfo() => $_clearField(9);
   @$pb.TagNumber(9)
   SourceCodeInfo ensureSourceCodeInfo() => $_ensure(8);
 
   /// Indexes of the public imported files in the dependency list above.
   @$pb.TagNumber(10)
-  $core.List<$core.int> get publicDependency => $_getList(9);
+  $pb.PbList<$core.int> get publicDependency => $_getList(9);
 
   /// Indexes of the weak imported files in the dependency list.
   /// For Google-internal migration only. Do not use.
   @$pb.TagNumber(11)
-  $core.List<$core.int> get weakDependency => $_getList(10);
+  $pb.PbList<$core.int> get weakDependency => $_getList(10);
 
   /// The syntax of the proto file.
   /// The supported values are "proto2" and "proto3".
@@ -237,7 +239,7 @@ class FileDescriptorProto extends $pb.GeneratedMessage {
   @$pb.TagNumber(12)
   $core.bool hasSyntax() => $_has(11);
   @$pb.TagNumber(12)
-  void clearSyntax() => clearField(12);
+  void clearSyntax() => $_clearField(12);
 }
 
 class DescriptorProto_ExtensionRange extends $pb.GeneratedMessage {
@@ -296,7 +298,7 @@ class DescriptorProto_ExtensionRange extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasStart() => $_has(0);
   @$pb.TagNumber(1)
-  void clearStart() => clearField(1);
+  void clearStart() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.int get end => $_getIZ(1);
@@ -305,16 +307,16 @@ class DescriptorProto_ExtensionRange extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasEnd() => $_has(1);
   @$pb.TagNumber(2)
-  void clearEnd() => clearField(2);
+  void clearEnd() => $_clearField(2);
 
   @$pb.TagNumber(3)
   ExtensionRangeOptions get options => $_getN(2);
   @$pb.TagNumber(3)
-  set options(ExtensionRangeOptions v) { setField(3, v); }
+  set options(ExtensionRangeOptions v) { $_setField(3, v); }
   @$pb.TagNumber(3)
   $core.bool hasOptions() => $_has(2);
   @$pb.TagNumber(3)
-  void clearOptions() => clearField(3);
+  void clearOptions() => $_clearField(3);
   @$pb.TagNumber(3)
   ExtensionRangeOptions ensureOptions() => $_ensure(2);
 }
@@ -374,7 +376,7 @@ class DescriptorProto_ReservedRange extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasStart() => $_has(0);
   @$pb.TagNumber(1)
-  void clearStart() => clearField(1);
+  void clearStart() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.int get end => $_getIZ(1);
@@ -383,7 +385,7 @@ class DescriptorProto_ReservedRange extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasEnd() => $_has(1);
   @$pb.TagNumber(2)
-  void clearEnd() => clearField(2);
+  void clearEnd() => $_clearField(2);
 }
 
 /// Describes a message type.
@@ -478,44 +480,44 @@ class DescriptorProto extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasName() => $_has(0);
   @$pb.TagNumber(1)
-  void clearName() => clearField(1);
+  void clearName() => $_clearField(1);
 
   @$pb.TagNumber(2)
-  $core.List<FieldDescriptorProto> get field => $_getList(1);
+  $pb.PbList<FieldDescriptorProto> get field => $_getList(1);
 
   @$pb.TagNumber(3)
-  $core.List<DescriptorProto> get nestedType => $_getList(2);
+  $pb.PbList<DescriptorProto> get nestedType => $_getList(2);
 
   @$pb.TagNumber(4)
-  $core.List<EnumDescriptorProto> get enumType => $_getList(3);
+  $pb.PbList<EnumDescriptorProto> get enumType => $_getList(3);
 
   @$pb.TagNumber(5)
-  $core.List<DescriptorProto_ExtensionRange> get extensionRange => $_getList(4);
+  $pb.PbList<DescriptorProto_ExtensionRange> get extensionRange => $_getList(4);
 
   @$pb.TagNumber(6)
-  $core.List<FieldDescriptorProto> get extension => $_getList(5);
+  $pb.PbList<FieldDescriptorProto> get extension => $_getList(5);
 
   @$pb.TagNumber(7)
   MessageOptions get options => $_getN(6);
   @$pb.TagNumber(7)
-  set options(MessageOptions v) { setField(7, v); }
+  set options(MessageOptions v) { $_setField(7, v); }
   @$pb.TagNumber(7)
   $core.bool hasOptions() => $_has(6);
   @$pb.TagNumber(7)
-  void clearOptions() => clearField(7);
+  void clearOptions() => $_clearField(7);
   @$pb.TagNumber(7)
   MessageOptions ensureOptions() => $_ensure(6);
 
   @$pb.TagNumber(8)
-  $core.List<OneofDescriptorProto> get oneofDecl => $_getList(7);
+  $pb.PbList<OneofDescriptorProto> get oneofDecl => $_getList(7);
 
   @$pb.TagNumber(9)
-  $core.List<DescriptorProto_ReservedRange> get reservedRange => $_getList(8);
+  $pb.PbList<DescriptorProto_ReservedRange> get reservedRange => $_getList(8);
 
   /// Reserved field names, which may not be used by fields in the same message.
   /// A given name may only be reserved once.
   @$pb.TagNumber(10)
-  $core.List<$core.String> get reservedName => $_getList(9);
+  $pb.PbList<$core.String> get reservedName => $_getList(9);
 }
 
 class ExtensionRangeOptions extends $pb.GeneratedMessage {
@@ -560,7 +562,7 @@ class ExtensionRangeOptions extends $pb.GeneratedMessage {
 
   /// The parser stores options it doesn't recognize here. See above.
   @$pb.TagNumber(999)
-  $core.List<UninterpretedOption> get uninterpretedOption => $_getList(0);
+  $pb.PbList<UninterpretedOption> get uninterpretedOption => $_getList(0);
 }
 
 /// Describes a field within a message.
@@ -655,7 +657,7 @@ class FieldDescriptorProto extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasName() => $_has(0);
   @$pb.TagNumber(1)
-  void clearName() => clearField(1);
+  void clearName() => $_clearField(1);
 
   /// For extensions, this is the name of the type being extended.  It is
   /// resolved in the same manner as type_name.
@@ -666,7 +668,7 @@ class FieldDescriptorProto extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasExtendee() => $_has(1);
   @$pb.TagNumber(2)
-  void clearExtendee() => clearField(2);
+  void clearExtendee() => $_clearField(2);
 
   @$pb.TagNumber(3)
   $core.int get number => $_getIZ(2);
@@ -675,27 +677,27 @@ class FieldDescriptorProto extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasNumber() => $_has(2);
   @$pb.TagNumber(3)
-  void clearNumber() => clearField(3);
+  void clearNumber() => $_clearField(3);
 
   @$pb.TagNumber(4)
   FieldDescriptorProto_Label get label => $_getN(3);
   @$pb.TagNumber(4)
-  set label(FieldDescriptorProto_Label v) { setField(4, v); }
+  set label(FieldDescriptorProto_Label v) { $_setField(4, v); }
   @$pb.TagNumber(4)
   $core.bool hasLabel() => $_has(3);
   @$pb.TagNumber(4)
-  void clearLabel() => clearField(4);
+  void clearLabel() => $_clearField(4);
 
   /// If type_name is set, this need not be set.  If both this and type_name
   /// are set, this must be one of TYPE_ENUM, TYPE_MESSAGE or TYPE_GROUP.
   @$pb.TagNumber(5)
   FieldDescriptorProto_Type get type => $_getN(4);
   @$pb.TagNumber(5)
-  set type(FieldDescriptorProto_Type v) { setField(5, v); }
+  set type(FieldDescriptorProto_Type v) { $_setField(5, v); }
   @$pb.TagNumber(5)
   $core.bool hasType() => $_has(4);
   @$pb.TagNumber(5)
-  void clearType() => clearField(5);
+  void clearType() => $_clearField(5);
 
   /// For message and enum types, this is the name of the type.  If the name
   /// starts with a '.', it is fully-qualified.  Otherwise, C++-like scoping
@@ -709,7 +711,7 @@ class FieldDescriptorProto extends $pb.GeneratedMessage {
   @$pb.TagNumber(6)
   $core.bool hasTypeName() => $_has(5);
   @$pb.TagNumber(6)
-  void clearTypeName() => clearField(6);
+  void clearTypeName() => $_clearField(6);
 
   /// For numeric types, contains the original text representation of the value.
   /// For booleans, "true" or "false".
@@ -723,16 +725,16 @@ class FieldDescriptorProto extends $pb.GeneratedMessage {
   @$pb.TagNumber(7)
   $core.bool hasDefaultValue() => $_has(6);
   @$pb.TagNumber(7)
-  void clearDefaultValue() => clearField(7);
+  void clearDefaultValue() => $_clearField(7);
 
   @$pb.TagNumber(8)
   FieldOptions get options => $_getN(7);
   @$pb.TagNumber(8)
-  set options(FieldOptions v) { setField(8, v); }
+  set options(FieldOptions v) { $_setField(8, v); }
   @$pb.TagNumber(8)
   $core.bool hasOptions() => $_has(7);
   @$pb.TagNumber(8)
-  void clearOptions() => clearField(8);
+  void clearOptions() => $_clearField(8);
   @$pb.TagNumber(8)
   FieldOptions ensureOptions() => $_ensure(7);
 
@@ -745,7 +747,7 @@ class FieldDescriptorProto extends $pb.GeneratedMessage {
   @$pb.TagNumber(9)
   $core.bool hasOneofIndex() => $_has(8);
   @$pb.TagNumber(9)
-  void clearOneofIndex() => clearField(9);
+  void clearOneofIndex() => $_clearField(9);
 
   /// JSON name of this field. The value is set by protocol compiler. If the
   /// user has set a "json_name" option on this field, that option's value
@@ -758,7 +760,7 @@ class FieldDescriptorProto extends $pb.GeneratedMessage {
   @$pb.TagNumber(10)
   $core.bool hasJsonName() => $_has(9);
   @$pb.TagNumber(10)
-  void clearJsonName() => clearField(10);
+  void clearJsonName() => $_clearField(10);
 }
 
 /// Describes a oneof.
@@ -813,16 +815,16 @@ class OneofDescriptorProto extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasName() => $_has(0);
   @$pb.TagNumber(1)
-  void clearName() => clearField(1);
+  void clearName() => $_clearField(1);
 
   @$pb.TagNumber(2)
   OneofOptions get options => $_getN(1);
   @$pb.TagNumber(2)
-  set options(OneofOptions v) { setField(2, v); }
+  set options(OneofOptions v) { $_setField(2, v); }
   @$pb.TagNumber(2)
   $core.bool hasOptions() => $_has(1);
   @$pb.TagNumber(2)
-  void clearOptions() => clearField(2);
+  void clearOptions() => $_clearField(2);
   @$pb.TagNumber(2)
   OneofOptions ensureOptions() => $_ensure(1);
 }
@@ -885,7 +887,7 @@ class EnumDescriptorProto_EnumReservedRange extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasStart() => $_has(0);
   @$pb.TagNumber(1)
-  void clearStart() => clearField(1);
+  void clearStart() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.int get end => $_getIZ(1);
@@ -894,7 +896,7 @@ class EnumDescriptorProto_EnumReservedRange extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasEnd() => $_has(1);
   @$pb.TagNumber(2)
-  void clearEnd() => clearField(2);
+  void clearEnd() => $_clearField(2);
 }
 
 /// Describes an enum type.
@@ -964,19 +966,19 @@ class EnumDescriptorProto extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasName() => $_has(0);
   @$pb.TagNumber(1)
-  void clearName() => clearField(1);
+  void clearName() => $_clearField(1);
 
   @$pb.TagNumber(2)
-  $core.List<EnumValueDescriptorProto> get value => $_getList(1);
+  $pb.PbList<EnumValueDescriptorProto> get value => $_getList(1);
 
   @$pb.TagNumber(3)
   EnumOptions get options => $_getN(2);
   @$pb.TagNumber(3)
-  set options(EnumOptions v) { setField(3, v); }
+  set options(EnumOptions v) { $_setField(3, v); }
   @$pb.TagNumber(3)
   $core.bool hasOptions() => $_has(2);
   @$pb.TagNumber(3)
-  void clearOptions() => clearField(3);
+  void clearOptions() => $_clearField(3);
   @$pb.TagNumber(3)
   EnumOptions ensureOptions() => $_ensure(2);
 
@@ -984,12 +986,12 @@ class EnumDescriptorProto extends $pb.GeneratedMessage {
   /// by enum values in the same enum declaration. Reserved ranges may not
   /// overlap.
   @$pb.TagNumber(4)
-  $core.List<EnumDescriptorProto_EnumReservedRange> get reservedRange => $_getList(3);
+  $pb.PbList<EnumDescriptorProto_EnumReservedRange> get reservedRange => $_getList(3);
 
   /// Reserved enum value names, which may not be reused. A given name may only
   /// be reserved once.
   @$pb.TagNumber(5)
-  $core.List<$core.String> get reservedName => $_getList(4);
+  $pb.PbList<$core.String> get reservedName => $_getList(4);
 }
 
 /// Describes a value within an enum.
@@ -1049,7 +1051,7 @@ class EnumValueDescriptorProto extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasName() => $_has(0);
   @$pb.TagNumber(1)
-  void clearName() => clearField(1);
+  void clearName() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.int get number => $_getIZ(1);
@@ -1058,16 +1060,16 @@ class EnumValueDescriptorProto extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasNumber() => $_has(1);
   @$pb.TagNumber(2)
-  void clearNumber() => clearField(2);
+  void clearNumber() => $_clearField(2);
 
   @$pb.TagNumber(3)
   EnumValueOptions get options => $_getN(2);
   @$pb.TagNumber(3)
-  set options(EnumValueOptions v) { setField(3, v); }
+  set options(EnumValueOptions v) { $_setField(3, v); }
   @$pb.TagNumber(3)
   $core.bool hasOptions() => $_has(2);
   @$pb.TagNumber(3)
-  void clearOptions() => clearField(3);
+  void clearOptions() => $_clearField(3);
   @$pb.TagNumber(3)
   EnumValueOptions ensureOptions() => $_ensure(2);
 }
@@ -1129,19 +1131,19 @@ class ServiceDescriptorProto extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasName() => $_has(0);
   @$pb.TagNumber(1)
-  void clearName() => clearField(1);
+  void clearName() => $_clearField(1);
 
   @$pb.TagNumber(2)
-  $core.List<MethodDescriptorProto> get method => $_getList(1);
+  $pb.PbList<MethodDescriptorProto> get method => $_getList(1);
 
   @$pb.TagNumber(3)
   ServiceOptions get options => $_getN(2);
   @$pb.TagNumber(3)
-  set options(ServiceOptions v) { setField(3, v); }
+  set options(ServiceOptions v) { $_setField(3, v); }
   @$pb.TagNumber(3)
   $core.bool hasOptions() => $_has(2);
   @$pb.TagNumber(3)
-  void clearOptions() => clearField(3);
+  void clearOptions() => $_clearField(3);
   @$pb.TagNumber(3)
   ServiceOptions ensureOptions() => $_ensure(2);
 }
@@ -1218,7 +1220,7 @@ class MethodDescriptorProto extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasName() => $_has(0);
   @$pb.TagNumber(1)
-  void clearName() => clearField(1);
+  void clearName() => $_clearField(1);
 
   /// Input and output type names.  These are resolved in the same way as
   /// FieldDescriptorProto.type_name, but must refer to a message type.
@@ -1229,7 +1231,7 @@ class MethodDescriptorProto extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasInputType() => $_has(1);
   @$pb.TagNumber(2)
-  void clearInputType() => clearField(2);
+  void clearInputType() => $_clearField(2);
 
   @$pb.TagNumber(3)
   $core.String get outputType => $_getSZ(2);
@@ -1238,16 +1240,16 @@ class MethodDescriptorProto extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasOutputType() => $_has(2);
   @$pb.TagNumber(3)
-  void clearOutputType() => clearField(3);
+  void clearOutputType() => $_clearField(3);
 
   @$pb.TagNumber(4)
   MethodOptions get options => $_getN(3);
   @$pb.TagNumber(4)
-  set options(MethodOptions v) { setField(4, v); }
+  set options(MethodOptions v) { $_setField(4, v); }
   @$pb.TagNumber(4)
   $core.bool hasOptions() => $_has(3);
   @$pb.TagNumber(4)
-  void clearOptions() => clearField(4);
+  void clearOptions() => $_clearField(4);
   @$pb.TagNumber(4)
   MethodOptions ensureOptions() => $_ensure(3);
 
@@ -1259,7 +1261,7 @@ class MethodDescriptorProto extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $core.bool hasClientStreaming() => $_has(4);
   @$pb.TagNumber(5)
-  void clearClientStreaming() => clearField(5);
+  void clearClientStreaming() => $_clearField(5);
 
   /// Identifies if server streams multiple server messages
   @$pb.TagNumber(6)
@@ -1269,7 +1271,7 @@ class MethodDescriptorProto extends $pb.GeneratedMessage {
   @$pb.TagNumber(6)
   $core.bool hasServerStreaming() => $_has(5);
   @$pb.TagNumber(6)
-  void clearServerStreaming() => clearField(6);
+  void clearServerStreaming() => $_clearField(6);
 }
 
 class FileOptions extends $pb.GeneratedMessage {
@@ -1425,7 +1427,7 @@ class FileOptions extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasJavaPackage() => $_has(0);
   @$pb.TagNumber(1)
-  void clearJavaPackage() => clearField(1);
+  void clearJavaPackage() => $_clearField(1);
 
   /// If set, all the classes from the .proto file are wrapped in a single
   /// outer class with the given name.  This applies to both Proto1
@@ -1439,16 +1441,16 @@ class FileOptions extends $pb.GeneratedMessage {
   @$pb.TagNumber(8)
   $core.bool hasJavaOuterClassname() => $_has(1);
   @$pb.TagNumber(8)
-  void clearJavaOuterClassname() => clearField(8);
+  void clearJavaOuterClassname() => $_clearField(8);
 
   @$pb.TagNumber(9)
   FileOptions_OptimizeMode get optimizeFor => $_getN(2);
   @$pb.TagNumber(9)
-  set optimizeFor(FileOptions_OptimizeMode v) { setField(9, v); }
+  set optimizeFor(FileOptions_OptimizeMode v) { $_setField(9, v); }
   @$pb.TagNumber(9)
   $core.bool hasOptimizeFor() => $_has(2);
   @$pb.TagNumber(9)
-  void clearOptimizeFor() => clearField(9);
+  void clearOptimizeFor() => $_clearField(9);
 
   /// If set true, then the Java code generator will generate a separate .java
   /// file for each top-level message, enum, and service defined in the .proto
@@ -1463,7 +1465,7 @@ class FileOptions extends $pb.GeneratedMessage {
   @$pb.TagNumber(10)
   $core.bool hasJavaMultipleFiles() => $_has(3);
   @$pb.TagNumber(10)
-  void clearJavaMultipleFiles() => clearField(10);
+  void clearJavaMultipleFiles() => $_clearField(10);
 
   /// Sets the Go package where structs generated from this .proto will be
   /// placed. If omitted, the Go package will be derived from the following:
@@ -1477,7 +1479,7 @@ class FileOptions extends $pb.GeneratedMessage {
   @$pb.TagNumber(11)
   $core.bool hasGoPackage() => $_has(4);
   @$pb.TagNumber(11)
-  void clearGoPackage() => clearField(11);
+  void clearGoPackage() => $_clearField(11);
 
   ///  Should generic services be generated in each language?  "Generic" services
   ///  are not specific to any particular RPC system.  They are generated by the
@@ -1496,7 +1498,7 @@ class FileOptions extends $pb.GeneratedMessage {
   @$pb.TagNumber(16)
   $core.bool hasCcGenericServices() => $_has(5);
   @$pb.TagNumber(16)
-  void clearCcGenericServices() => clearField(16);
+  void clearCcGenericServices() => $_clearField(16);
 
   @$pb.TagNumber(17)
   $core.bool get javaGenericServices => $_getBF(6);
@@ -1505,7 +1507,7 @@ class FileOptions extends $pb.GeneratedMessage {
   @$pb.TagNumber(17)
   $core.bool hasJavaGenericServices() => $_has(6);
   @$pb.TagNumber(17)
-  void clearJavaGenericServices() => clearField(17);
+  void clearJavaGenericServices() => $_clearField(17);
 
   @$pb.TagNumber(18)
   $core.bool get pyGenericServices => $_getBF(7);
@@ -1514,7 +1516,7 @@ class FileOptions extends $pb.GeneratedMessage {
   @$pb.TagNumber(18)
   $core.bool hasPyGenericServices() => $_has(7);
   @$pb.TagNumber(18)
-  void clearPyGenericServices() => clearField(18);
+  void clearPyGenericServices() => $_clearField(18);
 
   /// This option does nothing.
   @$core.Deprecated('This field is deprecated.')
@@ -1528,7 +1530,7 @@ class FileOptions extends $pb.GeneratedMessage {
   $core.bool hasJavaGenerateEqualsAndHash() => $_has(8);
   @$core.Deprecated('This field is deprecated.')
   @$pb.TagNumber(20)
-  void clearJavaGenerateEqualsAndHash() => clearField(20);
+  void clearJavaGenerateEqualsAndHash() => $_clearField(20);
 
   /// Is this file deprecated?
   /// Depending on the target platform, this can emit Deprecated annotations
@@ -1541,7 +1543,7 @@ class FileOptions extends $pb.GeneratedMessage {
   @$pb.TagNumber(23)
   $core.bool hasDeprecated() => $_has(9);
   @$pb.TagNumber(23)
-  void clearDeprecated() => clearField(23);
+  void clearDeprecated() => $_clearField(23);
 
   /// If set true, then the Java2 code generator will generate code that
   /// throws an exception whenever an attempt is made to assign a non-UTF-8
@@ -1556,7 +1558,7 @@ class FileOptions extends $pb.GeneratedMessage {
   @$pb.TagNumber(27)
   $core.bool hasJavaStringCheckUtf8() => $_has(10);
   @$pb.TagNumber(27)
-  void clearJavaStringCheckUtf8() => clearField(27);
+  void clearJavaStringCheckUtf8() => $_clearField(27);
 
   /// Enables the use of arenas for the proto messages in this file. This applies
   /// only to generated classes for C++.
@@ -1567,7 +1569,7 @@ class FileOptions extends $pb.GeneratedMessage {
   @$pb.TagNumber(31)
   $core.bool hasCcEnableArenas() => $_has(11);
   @$pb.TagNumber(31)
-  void clearCcEnableArenas() => clearField(31);
+  void clearCcEnableArenas() => $_clearField(31);
 
   /// Sets the objective c class prefix which is prepended to all objective c
   /// generated classes from this .proto. There is no default.
@@ -1578,7 +1580,7 @@ class FileOptions extends $pb.GeneratedMessage {
   @$pb.TagNumber(36)
   $core.bool hasObjcClassPrefix() => $_has(12);
   @$pb.TagNumber(36)
-  void clearObjcClassPrefix() => clearField(36);
+  void clearObjcClassPrefix() => $_clearField(36);
 
   /// Namespace for generated classes; defaults to the package.
   @$pb.TagNumber(37)
@@ -1588,7 +1590,7 @@ class FileOptions extends $pb.GeneratedMessage {
   @$pb.TagNumber(37)
   $core.bool hasCsharpNamespace() => $_has(13);
   @$pb.TagNumber(37)
-  void clearCsharpNamespace() => clearField(37);
+  void clearCsharpNamespace() => $_clearField(37);
 
   /// By default Swift generators will take the proto package and CamelCase it
   /// replacing '.' with underscore and use that to prefix the types/symbols
@@ -1601,7 +1603,7 @@ class FileOptions extends $pb.GeneratedMessage {
   @$pb.TagNumber(39)
   $core.bool hasSwiftPrefix() => $_has(14);
   @$pb.TagNumber(39)
-  void clearSwiftPrefix() => clearField(39);
+  void clearSwiftPrefix() => $_clearField(39);
 
   /// Sets the php class prefix which is prepended to all php generated classes
   /// from this .proto. Default is empty.
@@ -1612,7 +1614,7 @@ class FileOptions extends $pb.GeneratedMessage {
   @$pb.TagNumber(40)
   $core.bool hasPhpClassPrefix() => $_has(15);
   @$pb.TagNumber(40)
-  void clearPhpClassPrefix() => clearField(40);
+  void clearPhpClassPrefix() => $_clearField(40);
 
   /// Use this option to change the namespace of php generated classes. Default
   /// is empty. When this option is empty, the package name will be used for
@@ -1624,7 +1626,7 @@ class FileOptions extends $pb.GeneratedMessage {
   @$pb.TagNumber(41)
   $core.bool hasPhpNamespace() => $_has(16);
   @$pb.TagNumber(41)
-  void clearPhpNamespace() => clearField(41);
+  void clearPhpNamespace() => $_clearField(41);
 
   @$pb.TagNumber(42)
   $core.bool get phpGenericServices => $_getBF(17);
@@ -1633,7 +1635,7 @@ class FileOptions extends $pb.GeneratedMessage {
   @$pb.TagNumber(42)
   $core.bool hasPhpGenericServices() => $_has(17);
   @$pb.TagNumber(42)
-  void clearPhpGenericServices() => clearField(42);
+  void clearPhpGenericServices() => $_clearField(42);
 
   /// Use this option to change the namespace of php generated metadata classes.
   /// Default is empty. When this option is empty, the proto file name will be
@@ -1645,7 +1647,7 @@ class FileOptions extends $pb.GeneratedMessage {
   @$pb.TagNumber(44)
   $core.bool hasPhpMetadataNamespace() => $_has(18);
   @$pb.TagNumber(44)
-  void clearPhpMetadataNamespace() => clearField(44);
+  void clearPhpMetadataNamespace() => $_clearField(44);
 
   /// Use this option to change the package of ruby generated classes. Default
   /// is empty. When this option is not set, the package name will be used for
@@ -1657,12 +1659,12 @@ class FileOptions extends $pb.GeneratedMessage {
   @$pb.TagNumber(45)
   $core.bool hasRubyPackage() => $_has(19);
   @$pb.TagNumber(45)
-  void clearRubyPackage() => clearField(45);
+  void clearRubyPackage() => $_clearField(45);
 
   /// The parser stores options it doesn't recognize here.
   /// See the documentation for the "Options" section above.
   @$pb.TagNumber(999)
-  $core.List<UninterpretedOption> get uninterpretedOption => $_getList(20);
+  $pb.PbList<UninterpretedOption> get uninterpretedOption => $_getList(20);
 }
 
 class MessageOptions extends $pb.GeneratedMessage {
@@ -1750,7 +1752,7 @@ class MessageOptions extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasMessageSetWireFormat() => $_has(0);
   @$pb.TagNumber(1)
-  void clearMessageSetWireFormat() => clearField(1);
+  void clearMessageSetWireFormat() => $_clearField(1);
 
   /// Disables the generation of the standard "descriptor()" accessor, which can
   /// conflict with a field of the same name.  This is meant to make migration
@@ -1762,7 +1764,7 @@ class MessageOptions extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasNoStandardDescriptorAccessor() => $_has(1);
   @$pb.TagNumber(2)
-  void clearNoStandardDescriptorAccessor() => clearField(2);
+  void clearNoStandardDescriptorAccessor() => $_clearField(2);
 
   /// Is this message deprecated?
   /// Depending on the target platform, this can emit Deprecated annotations
@@ -1775,7 +1777,7 @@ class MessageOptions extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasDeprecated() => $_has(2);
   @$pb.TagNumber(3)
-  void clearDeprecated() => clearField(3);
+  void clearDeprecated() => $_clearField(3);
 
   ///  Whether the message is an automatically generated map entry type for the
   ///  maps field.
@@ -1805,11 +1807,11 @@ class MessageOptions extends $pb.GeneratedMessage {
   @$pb.TagNumber(7)
   $core.bool hasMapEntry() => $_has(3);
   @$pb.TagNumber(7)
-  void clearMapEntry() => clearField(7);
+  void clearMapEntry() => $_clearField(7);
 
   /// The parser stores options it doesn't recognize here. See above.
   @$pb.TagNumber(999)
-  $core.List<UninterpretedOption> get uninterpretedOption => $_getList(4);
+  $pb.PbList<UninterpretedOption> get uninterpretedOption => $_getList(4);
 }
 
 class FieldOptions extends $pb.GeneratedMessage {
@@ -1889,11 +1891,11 @@ class FieldOptions extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   FieldOptions_CType get ctype => $_getN(0);
   @$pb.TagNumber(1)
-  set ctype(FieldOptions_CType v) { setField(1, v); }
+  set ctype(FieldOptions_CType v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasCtype() => $_has(0);
   @$pb.TagNumber(1)
-  void clearCtype() => clearField(1);
+  void clearCtype() => $_clearField(1);
 
   /// The packed option can be enabled for repeated primitive fields to enable
   /// a more efficient representation on the wire. Rather than repeatedly
@@ -1907,7 +1909,7 @@ class FieldOptions extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasPacked() => $_has(1);
   @$pb.TagNumber(2)
-  void clearPacked() => clearField(2);
+  void clearPacked() => $_clearField(2);
 
   /// Is this field deprecated?
   /// Depending on the target platform, this can emit Deprecated annotations
@@ -1920,7 +1922,7 @@ class FieldOptions extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasDeprecated() => $_has(2);
   @$pb.TagNumber(3)
-  void clearDeprecated() => clearField(3);
+  void clearDeprecated() => $_clearField(3);
 
   ///  Should this field be parsed lazily?  Lazy applies only to message-type
   ///  fields.  It means that when the outer message is initially parsed, the
@@ -1957,7 +1959,7 @@ class FieldOptions extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $core.bool hasLazy() => $_has(3);
   @$pb.TagNumber(5)
-  void clearLazy() => clearField(5);
+  void clearLazy() => $_clearField(5);
 
   ///  The jstype option determines the JavaScript type used for values of the
   ///  field.  The option is permitted only for 64 bit integral and fixed types
@@ -1973,11 +1975,11 @@ class FieldOptions extends $pb.GeneratedMessage {
   @$pb.TagNumber(6)
   FieldOptions_JSType get jstype => $_getN(4);
   @$pb.TagNumber(6)
-  set jstype(FieldOptions_JSType v) { setField(6, v); }
+  set jstype(FieldOptions_JSType v) { $_setField(6, v); }
   @$pb.TagNumber(6)
   $core.bool hasJstype() => $_has(4);
   @$pb.TagNumber(6)
-  void clearJstype() => clearField(6);
+  void clearJstype() => $_clearField(6);
 
   /// For Google-internal migration only. Do not use.
   @$pb.TagNumber(10)
@@ -1987,11 +1989,11 @@ class FieldOptions extends $pb.GeneratedMessage {
   @$pb.TagNumber(10)
   $core.bool hasWeak() => $_has(5);
   @$pb.TagNumber(10)
-  void clearWeak() => clearField(10);
+  void clearWeak() => $_clearField(10);
 
   /// The parser stores options it doesn't recognize here. See above.
   @$pb.TagNumber(999)
-  $core.List<UninterpretedOption> get uninterpretedOption => $_getList(6);
+  $pb.PbList<UninterpretedOption> get uninterpretedOption => $_getList(6);
 }
 
 class OneofOptions extends $pb.GeneratedMessage {
@@ -2036,7 +2038,7 @@ class OneofOptions extends $pb.GeneratedMessage {
 
   /// The parser stores options it doesn't recognize here. See above.
   @$pb.TagNumber(999)
-  $core.List<UninterpretedOption> get uninterpretedOption => $_getList(0);
+  $pb.PbList<UninterpretedOption> get uninterpretedOption => $_getList(0);
 }
 
 class EnumOptions extends $pb.GeneratedMessage {
@@ -2098,7 +2100,7 @@ class EnumOptions extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasAllowAlias() => $_has(0);
   @$pb.TagNumber(2)
-  void clearAllowAlias() => clearField(2);
+  void clearAllowAlias() => $_clearField(2);
 
   /// Is this enum deprecated?
   /// Depending on the target platform, this can emit Deprecated annotations
@@ -2111,11 +2113,11 @@ class EnumOptions extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasDeprecated() => $_has(1);
   @$pb.TagNumber(3)
-  void clearDeprecated() => clearField(3);
+  void clearDeprecated() => $_clearField(3);
 
   /// The parser stores options it doesn't recognize here. See above.
   @$pb.TagNumber(999)
-  $core.List<UninterpretedOption> get uninterpretedOption => $_getList(2);
+  $pb.PbList<UninterpretedOption> get uninterpretedOption => $_getList(2);
 }
 
 class EnumValueOptions extends $pb.GeneratedMessage {
@@ -2174,11 +2176,11 @@ class EnumValueOptions extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasDeprecated() => $_has(0);
   @$pb.TagNumber(1)
-  void clearDeprecated() => clearField(1);
+  void clearDeprecated() => $_clearField(1);
 
   /// The parser stores options it doesn't recognize here. See above.
   @$pb.TagNumber(999)
-  $core.List<UninterpretedOption> get uninterpretedOption => $_getList(1);
+  $pb.PbList<UninterpretedOption> get uninterpretedOption => $_getList(1);
 }
 
 class ServiceOptions extends $pb.GeneratedMessage {
@@ -2237,11 +2239,11 @@ class ServiceOptions extends $pb.GeneratedMessage {
   @$pb.TagNumber(33)
   $core.bool hasDeprecated() => $_has(0);
   @$pb.TagNumber(33)
-  void clearDeprecated() => clearField(33);
+  void clearDeprecated() => $_clearField(33);
 
   /// The parser stores options it doesn't recognize here. See above.
   @$pb.TagNumber(999)
-  $core.List<UninterpretedOption> get uninterpretedOption => $_getList(1);
+  $pb.PbList<UninterpretedOption> get uninterpretedOption => $_getList(1);
 }
 
 class MethodOptions extends $pb.GeneratedMessage {
@@ -2305,20 +2307,20 @@ class MethodOptions extends $pb.GeneratedMessage {
   @$pb.TagNumber(33)
   $core.bool hasDeprecated() => $_has(0);
   @$pb.TagNumber(33)
-  void clearDeprecated() => clearField(33);
+  void clearDeprecated() => $_clearField(33);
 
   @$pb.TagNumber(34)
   MethodOptions_IdempotencyLevel get idempotencyLevel => $_getN(1);
   @$pb.TagNumber(34)
-  set idempotencyLevel(MethodOptions_IdempotencyLevel v) { setField(34, v); }
+  set idempotencyLevel(MethodOptions_IdempotencyLevel v) { $_setField(34, v); }
   @$pb.TagNumber(34)
   $core.bool hasIdempotencyLevel() => $_has(1);
   @$pb.TagNumber(34)
-  void clearIdempotencyLevel() => clearField(34);
+  void clearIdempotencyLevel() => $_clearField(34);
 
   /// The parser stores options it doesn't recognize here. See above.
   @$pb.TagNumber(999)
-  $core.List<UninterpretedOption> get uninterpretedOption => $_getList(2);
+  $pb.PbList<UninterpretedOption> get uninterpretedOption => $_getList(2);
 }
 
 /// The name of the uninterpreted option.  Each string represents a segment in
@@ -2377,7 +2379,7 @@ class UninterpretedOption_NamePart extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasNamePart() => $_has(0);
   @$pb.TagNumber(1)
-  void clearNamePart() => clearField(1);
+  void clearNamePart() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.bool get isExtension => $_getBF(1);
@@ -2386,7 +2388,7 @@ class UninterpretedOption_NamePart extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasIsExtension() => $_has(1);
   @$pb.TagNumber(2)
-  void clearIsExtension() => clearField(2);
+  void clearIsExtension() => $_clearField(2);
 }
 
 /// A message representing a option the parser does not recognize. This only
@@ -2465,7 +2467,7 @@ class UninterpretedOption extends $pb.GeneratedMessage {
   static UninterpretedOption? _defaultInstance;
 
   @$pb.TagNumber(2)
-  $core.List<UninterpretedOption_NamePart> get name => $_getList(0);
+  $pb.PbList<UninterpretedOption_NamePart> get name => $_getList(0);
 
   /// The value of the uninterpreted option, in whatever type the tokenizer
   /// identified it as during parsing. Exactly one of these should be set.
@@ -2476,7 +2478,7 @@ class UninterpretedOption extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasIdentifierValue() => $_has(1);
   @$pb.TagNumber(3)
-  void clearIdentifierValue() => clearField(3);
+  void clearIdentifierValue() => $_clearField(3);
 
   @$pb.TagNumber(4)
   $fixnum.Int64 get positiveIntValue => $_getI64(2);
@@ -2485,7 +2487,7 @@ class UninterpretedOption extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasPositiveIntValue() => $_has(2);
   @$pb.TagNumber(4)
-  void clearPositiveIntValue() => clearField(4);
+  void clearPositiveIntValue() => $_clearField(4);
 
   @$pb.TagNumber(5)
   $fixnum.Int64 get negativeIntValue => $_getI64(3);
@@ -2494,7 +2496,7 @@ class UninterpretedOption extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $core.bool hasNegativeIntValue() => $_has(3);
   @$pb.TagNumber(5)
-  void clearNegativeIntValue() => clearField(5);
+  void clearNegativeIntValue() => $_clearField(5);
 
   @$pb.TagNumber(6)
   $core.double get doubleValue => $_getN(4);
@@ -2503,7 +2505,7 @@ class UninterpretedOption extends $pb.GeneratedMessage {
   @$pb.TagNumber(6)
   $core.bool hasDoubleValue() => $_has(4);
   @$pb.TagNumber(6)
-  void clearDoubleValue() => clearField(6);
+  void clearDoubleValue() => $_clearField(6);
 
   @$pb.TagNumber(7)
   $core.List<$core.int> get stringValue => $_getN(5);
@@ -2512,7 +2514,7 @@ class UninterpretedOption extends $pb.GeneratedMessage {
   @$pb.TagNumber(7)
   $core.bool hasStringValue() => $_has(5);
   @$pb.TagNumber(7)
-  void clearStringValue() => clearField(7);
+  void clearStringValue() => $_clearField(7);
 
   @$pb.TagNumber(8)
   $core.String get aggregateValue => $_getSZ(6);
@@ -2521,7 +2523,7 @@ class UninterpretedOption extends $pb.GeneratedMessage {
   @$pb.TagNumber(8)
   $core.bool hasAggregateValue() => $_has(6);
   @$pb.TagNumber(8)
-  void clearAggregateValue() => clearField(8);
+  void clearAggregateValue() => $_clearField(8);
 }
 
 class SourceCodeInfo_Location extends $pb.GeneratedMessage {
@@ -2608,7 +2610,7 @@ class SourceCodeInfo_Location extends $pb.GeneratedMessage {
   ///  this path refers to the whole field declaration (from the beginning
   ///  of the label to the terminating semicolon).
   @$pb.TagNumber(1)
-  $core.List<$core.int> get path => $_getList(0);
+  $pb.PbList<$core.int> get path => $_getList(0);
 
   /// Always has exactly three or four elements: start line, start column,
   /// end line (optional, otherwise assumed same as start line), end column.
@@ -2616,7 +2618,7 @@ class SourceCodeInfo_Location extends $pb.GeneratedMessage {
   /// and column numbers are zero-based -- typically you will want to add
   /// 1 to each before displaying to a user.
   @$pb.TagNumber(2)
-  $core.List<$core.int> get span => $_getList(1);
+  $pb.PbList<$core.int> get span => $_getList(1);
 
   ///  If this SourceCodeInfo represents a complete declaration, these are any
   ///  comments appearing before and after the declaration which appear to be
@@ -2672,7 +2674,7 @@ class SourceCodeInfo_Location extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasLeadingComments() => $_has(2);
   @$pb.TagNumber(3)
-  void clearLeadingComments() => clearField(3);
+  void clearLeadingComments() => $_clearField(3);
 
   @$pb.TagNumber(4)
   $core.String get trailingComments => $_getSZ(3);
@@ -2681,10 +2683,10 @@ class SourceCodeInfo_Location extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasTrailingComments() => $_has(3);
   @$pb.TagNumber(4)
-  void clearTrailingComments() => clearField(4);
+  void clearTrailingComments() => $_clearField(4);
 
   @$pb.TagNumber(6)
-  $core.List<$core.String> get leadingDetachedComments => $_getList(4);
+  $pb.PbList<$core.String> get leadingDetachedComments => $_getList(4);
 }
 
 /// Encapsulates information about the original source file from which a
@@ -2773,7 +2775,7 @@ class SourceCodeInfo extends $pb.GeneratedMessage {
   ///    ignore those that it doesn't understand, as more types of locations could
   ///    be recorded in the future.
   @$pb.TagNumber(1)
-  $core.List<SourceCodeInfo_Location> get location => $_getList(0);
+  $pb.PbList<SourceCodeInfo_Location> get location => $_getList(0);
 }
 
 class GeneratedCodeInfo_Annotation extends $pb.GeneratedMessage {
@@ -2834,7 +2836,7 @@ class GeneratedCodeInfo_Annotation extends $pb.GeneratedMessage {
   /// Identifies the element in the original source .proto file. This field
   /// is formatted the same as SourceCodeInfo.Location.path.
   @$pb.TagNumber(1)
-  $core.List<$core.int> get path => $_getList(0);
+  $pb.PbList<$core.int> get path => $_getList(0);
 
   /// Identifies the filesystem path to the original source .proto.
   @$pb.TagNumber(2)
@@ -2844,7 +2846,7 @@ class GeneratedCodeInfo_Annotation extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasSourceFile() => $_has(1);
   @$pb.TagNumber(2)
-  void clearSourceFile() => clearField(2);
+  void clearSourceFile() => $_clearField(2);
 
   /// Identifies the starting offset in bytes in the generated code
   /// that relates to the identified object.
@@ -2855,7 +2857,7 @@ class GeneratedCodeInfo_Annotation extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasBegin() => $_has(2);
   @$pb.TagNumber(3)
-  void clearBegin() => clearField(3);
+  void clearBegin() => $_clearField(3);
 
   /// Identifies the ending offset in bytes in the generated code that
   /// relates to the identified offset. The end offset should be one past
@@ -2867,7 +2869,7 @@ class GeneratedCodeInfo_Annotation extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasEnd() => $_has(3);
   @$pb.TagNumber(4)
-  void clearEnd() => clearField(4);
+  void clearEnd() => $_clearField(4);
 }
 
 /// Describes the relationship between generated code and its original source
@@ -2916,7 +2918,7 @@ class GeneratedCodeInfo extends $pb.GeneratedMessage {
   /// An Annotation connects some span of text in generated code to an element
   /// of its generating .proto file.
   @$pb.TagNumber(1)
-  $core.List<GeneratedCodeInfo_Annotation> get annotation => $_getList(0);
+  $pb.PbList<GeneratedCodeInfo_Annotation> get annotation => $_getList(0);
 }
 
 
diff --git a/lib/google/protobuf/descriptor.pbenum.dart b/lib/google/protobuf/descriptor.pbenum.dart
index bfbf1bd..8f0dd7b 100644
--- a/lib/google/protobuf/descriptor.pbenum.dart
+++ b/lib/google/protobuf/descriptor.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/descriptor.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -14,17 +14,28 @@ import 'dart:core' as $core;
 import 'package:protobuf/protobuf.dart' as $pb;
 
 class FieldDescriptorProto_Type extends $pb.ProtobufEnum {
+  /// 0 is reserved for errors.
+  /// Order is weird for historical reasons.
   static const FieldDescriptorProto_Type TYPE_DOUBLE = FieldDescriptorProto_Type._(1, _omitEnumNames ? '' : 'TYPE_DOUBLE');
   static const FieldDescriptorProto_Type TYPE_FLOAT = FieldDescriptorProto_Type._(2, _omitEnumNames ? '' : 'TYPE_FLOAT');
+  /// Not ZigZag encoded.  Negative numbers take 10 bytes.  Use TYPE_SINT64 if
+  /// negative values are likely.
   static const FieldDescriptorProto_Type TYPE_INT64 = FieldDescriptorProto_Type._(3, _omitEnumNames ? '' : 'TYPE_INT64');
   static const FieldDescriptorProto_Type TYPE_UINT64 = FieldDescriptorProto_Type._(4, _omitEnumNames ? '' : 'TYPE_UINT64');
+  /// Not ZigZag encoded.  Negative numbers take 10 bytes.  Use TYPE_SINT32 if
+  /// negative values are likely.
   static const FieldDescriptorProto_Type TYPE_INT32 = FieldDescriptorProto_Type._(5, _omitEnumNames ? '' : 'TYPE_INT32');
   static const FieldDescriptorProto_Type TYPE_FIXED64 = FieldDescriptorProto_Type._(6, _omitEnumNames ? '' : 'TYPE_FIXED64');
   static const FieldDescriptorProto_Type TYPE_FIXED32 = FieldDescriptorProto_Type._(7, _omitEnumNames ? '' : 'TYPE_FIXED32');
   static const FieldDescriptorProto_Type TYPE_BOOL = FieldDescriptorProto_Type._(8, _omitEnumNames ? '' : 'TYPE_BOOL');
   static const FieldDescriptorProto_Type TYPE_STRING = FieldDescriptorProto_Type._(9, _omitEnumNames ? '' : 'TYPE_STRING');
+  /// Tag-delimited aggregate.
+  /// Group type is deprecated and not supported in proto3. However, Proto3
+  /// implementations should still be able to parse the group wire format and
+  /// treat group fields as unknown fields.
   static const FieldDescriptorProto_Type TYPE_GROUP = FieldDescriptorProto_Type._(10, _omitEnumNames ? '' : 'TYPE_GROUP');
   static const FieldDescriptorProto_Type TYPE_MESSAGE = FieldDescriptorProto_Type._(11, _omitEnumNames ? '' : 'TYPE_MESSAGE');
+  /// New in version 2.
   static const FieldDescriptorProto_Type TYPE_BYTES = FieldDescriptorProto_Type._(12, _omitEnumNames ? '' : 'TYPE_BYTES');
   static const FieldDescriptorProto_Type TYPE_UINT32 = FieldDescriptorProto_Type._(13, _omitEnumNames ? '' : 'TYPE_UINT32');
   static const FieldDescriptorProto_Type TYPE_ENUM = FieldDescriptorProto_Type._(14, _omitEnumNames ? '' : 'TYPE_ENUM');
@@ -57,10 +68,11 @@ class FieldDescriptorProto_Type extends $pb.ProtobufEnum {
   static final $core.Map<$core.int, FieldDescriptorProto_Type> _byValue = $pb.ProtobufEnum.initByValue(values);
   static FieldDescriptorProto_Type? valueOf($core.int value) => _byValue[value];
 
-  const FieldDescriptorProto_Type._($core.int v, $core.String n) : super(v, n);
+  const FieldDescriptorProto_Type._(super.v, super.n);
 }
 
 class FieldDescriptorProto_Label extends $pb.ProtobufEnum {
+  /// 0 is reserved for errors
   static const FieldDescriptorProto_Label LABEL_OPTIONAL = FieldDescriptorProto_Label._(1, _omitEnumNames ? '' : 'LABEL_OPTIONAL');
   static const FieldDescriptorProto_Label LABEL_REQUIRED = FieldDescriptorProto_Label._(2, _omitEnumNames ? '' : 'LABEL_REQUIRED');
   static const FieldDescriptorProto_Label LABEL_REPEATED = FieldDescriptorProto_Label._(3, _omitEnumNames ? '' : 'LABEL_REPEATED');
@@ -74,12 +86,13 @@ class FieldDescriptorProto_Label extends $pb.ProtobufEnum {
   static final $core.Map<$core.int, FieldDescriptorProto_Label> _byValue = $pb.ProtobufEnum.initByValue(values);
   static FieldDescriptorProto_Label? valueOf($core.int value) => _byValue[value];
 
-  const FieldDescriptorProto_Label._($core.int v, $core.String n) : super(v, n);
+  const FieldDescriptorProto_Label._(super.v, super.n);
 }
 
 /// Generated classes can be optimized for speed or code size.
 class FileOptions_OptimizeMode extends $pb.ProtobufEnum {
   static const FileOptions_OptimizeMode SPEED = FileOptions_OptimizeMode._(1, _omitEnumNames ? '' : 'SPEED');
+  /// etc.
   static const FileOptions_OptimizeMode CODE_SIZE = FileOptions_OptimizeMode._(2, _omitEnumNames ? '' : 'CODE_SIZE');
   static const FileOptions_OptimizeMode LITE_RUNTIME = FileOptions_OptimizeMode._(3, _omitEnumNames ? '' : 'LITE_RUNTIME');
 
@@ -92,10 +105,11 @@ class FileOptions_OptimizeMode extends $pb.ProtobufEnum {
   static final $core.Map<$core.int, FileOptions_OptimizeMode> _byValue = $pb.ProtobufEnum.initByValue(values);
   static FileOptions_OptimizeMode? valueOf($core.int value) => _byValue[value];
 
-  const FileOptions_OptimizeMode._($core.int v, $core.String n) : super(v, n);
+  const FileOptions_OptimizeMode._(super.v, super.n);
 }
 
 class FieldOptions_CType extends $pb.ProtobufEnum {
+  /// Default mode.
   static const FieldOptions_CType STRING = FieldOptions_CType._(0, _omitEnumNames ? '' : 'STRING');
   static const FieldOptions_CType CORD = FieldOptions_CType._(1, _omitEnumNames ? '' : 'CORD');
   static const FieldOptions_CType STRING_PIECE = FieldOptions_CType._(2, _omitEnumNames ? '' : 'STRING_PIECE');
@@ -109,12 +123,15 @@ class FieldOptions_CType extends $pb.ProtobufEnum {
   static final $core.Map<$core.int, FieldOptions_CType> _byValue = $pb.ProtobufEnum.initByValue(values);
   static FieldOptions_CType? valueOf($core.int value) => _byValue[value];
 
-  const FieldOptions_CType._($core.int v, $core.String n) : super(v, n);
+  const FieldOptions_CType._(super.v, super.n);
 }
 
 class FieldOptions_JSType extends $pb.ProtobufEnum {
+  /// Use the default type.
   static const FieldOptions_JSType JS_NORMAL = FieldOptions_JSType._(0, _omitEnumNames ? '' : 'JS_NORMAL');
+  /// Use JavaScript strings.
   static const FieldOptions_JSType JS_STRING = FieldOptions_JSType._(1, _omitEnumNames ? '' : 'JS_STRING');
+  /// Use JavaScript numbers.
   static const FieldOptions_JSType JS_NUMBER = FieldOptions_JSType._(2, _omitEnumNames ? '' : 'JS_NUMBER');
 
   static const $core.List<FieldOptions_JSType> values = <FieldOptions_JSType> [
@@ -126,7 +143,7 @@ class FieldOptions_JSType extends $pb.ProtobufEnum {
   static final $core.Map<$core.int, FieldOptions_JSType> _byValue = $pb.ProtobufEnum.initByValue(values);
   static FieldOptions_JSType? valueOf($core.int value) => _byValue[value];
 
-  const FieldOptions_JSType._($core.int v, $core.String n) : super(v, n);
+  const FieldOptions_JSType._(super.v, super.n);
 }
 
 /// Is this method side-effect-free (or safe in HTTP parlance), or idempotent,
@@ -146,7 +163,7 @@ class MethodOptions_IdempotencyLevel extends $pb.ProtobufEnum {
   static final $core.Map<$core.int, MethodOptions_IdempotencyLevel> _byValue = $pb.ProtobufEnum.initByValue(values);
   static MethodOptions_IdempotencyLevel? valueOf($core.int value) => _byValue[value];
 
-  const MethodOptions_IdempotencyLevel._($core.int v, $core.String n) : super(v, n);
+  const MethodOptions_IdempotencyLevel._(super.v, super.n);
 }
 
 
diff --git a/lib/google/protobuf/descriptor.pbjson.dart b/lib/google/protobuf/descriptor.pbjson.dart
index eaa9c28..d071cbb 100644
--- a/lib/google/protobuf/descriptor.pbjson.dart
+++ b/lib/google/protobuf/descriptor.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/descriptor.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/google/protobuf/duration.pb.dart b/lib/google/protobuf/duration.pb.dart
index 622c92d..62c8ba2 100644
--- a/lib/google/protobuf/duration.pb.dart
+++ b/lib/google/protobuf/duration.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/duration.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -15,6 +15,8 @@ import 'package:fixnum/fixnum.dart' as $fixnum;
 import 'package:protobuf/protobuf.dart' as $pb;
 import 'package:protobuf/src/protobuf/mixins/well_known.dart' as $mixin;
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 ///  A Duration represents a signed, fixed-length span of time represented
 ///  as a count of seconds and fractions of seconds at nanosecond
 ///  resolution. It is independent of any calendar and concepts like "day"
@@ -128,7 +130,7 @@ class Duration extends $pb.GeneratedMessage with $mixin.DurationMixin {
   @$pb.TagNumber(1)
   $core.bool hasSeconds() => $_has(0);
   @$pb.TagNumber(1)
-  void clearSeconds() => clearField(1);
+  void clearSeconds() => $_clearField(1);
 
   /// Signed fractions of a second at nanosecond resolution of the span
   /// of time. Durations less than one second are represented with a 0
@@ -143,7 +145,7 @@ class Duration extends $pb.GeneratedMessage with $mixin.DurationMixin {
   @$pb.TagNumber(2)
   $core.bool hasNanos() => $_has(1);
   @$pb.TagNumber(2)
-  void clearNanos() => clearField(2);
+  void clearNanos() => $_clearField(2);
 }
 
 
diff --git a/lib/google/protobuf/duration.pbenum.dart b/lib/google/protobuf/duration.pbenum.dart
index 403b010..dde5f36 100644
--- a/lib/google/protobuf/duration.pbenum.dart
+++ b/lib/google/protobuf/duration.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/duration.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/google/protobuf/duration.pbjson.dart b/lib/google/protobuf/duration.pbjson.dart
index aacca43..699c38e 100644
--- a/lib/google/protobuf/duration.pbjson.dart
+++ b/lib/google/protobuf/duration.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/duration.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/google/protobuf/empty.pb.dart b/lib/google/protobuf/empty.pb.dart
index fb65fac..3ed0560 100644
--- a/lib/google/protobuf/empty.pb.dart
+++ b/lib/google/protobuf/empty.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/empty.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -13,6 +13,8 @@ import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 ///  A generic empty message that you can re-use to avoid defining duplicated
 ///  empty messages in your APIs. A typical example is to use it as the request
 ///  or the response type of an API method. For instance:
diff --git a/lib/google/protobuf/empty.pbenum.dart b/lib/google/protobuf/empty.pbenum.dart
index 510bac1..dce3af5 100644
--- a/lib/google/protobuf/empty.pbenum.dart
+++ b/lib/google/protobuf/empty.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/empty.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/google/protobuf/empty.pbjson.dart b/lib/google/protobuf/empty.pbjson.dart
index c7245b6..b193544 100644
--- a/lib/google/protobuf/empty.pbjson.dart
+++ b/lib/google/protobuf/empty.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/empty.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/google/protobuf/field_mask.pb.dart b/lib/google/protobuf/field_mask.pb.dart
index 12037c6..1f35eef 100644
--- a/lib/google/protobuf/field_mask.pb.dart
+++ b/lib/google/protobuf/field_mask.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/field_mask.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -14,6 +14,8 @@ import 'dart:core' as $core;
 import 'package:protobuf/protobuf.dart' as $pb;
 import 'package:protobuf/src/protobuf/mixins/well_known.dart' as $mixin;
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 ///  `FieldMask` represents a set of symbolic field paths, for example:
 ///
 ///      paths: "f.a"
@@ -255,7 +257,7 @@ class FieldMask extends $pb.GeneratedMessage with $mixin.FieldMaskMixin {
 
   /// The set of field mask paths.
   @$pb.TagNumber(1)
-  $core.List<$core.String> get paths => $_getList(0);
+  $pb.PbList<$core.String> get paths => $_getList(0);
 }
 
 
diff --git a/lib/google/protobuf/field_mask.pbenum.dart b/lib/google/protobuf/field_mask.pbenum.dart
index 97d02b5..9d48117 100644
--- a/lib/google/protobuf/field_mask.pbenum.dart
+++ b/lib/google/protobuf/field_mask.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/field_mask.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/google/protobuf/field_mask.pbjson.dart b/lib/google/protobuf/field_mask.pbjson.dart
index cc50b08..aeb1f52 100644
--- a/lib/google/protobuf/field_mask.pbjson.dart
+++ b/lib/google/protobuf/field_mask.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/field_mask.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/google/protobuf/source_context.pb.dart b/lib/google/protobuf/source_context.pb.dart
index 423ce59..c769644 100644
--- a/lib/google/protobuf/source_context.pb.dart
+++ b/lib/google/protobuf/source_context.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/source_context.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -13,6 +13,8 @@ import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 /// `SourceContext` represents information about the source of a
 /// protobuf element, like the file in which it is defined.
 class SourceContext extends $pb.GeneratedMessage {
@@ -64,7 +66,7 @@ class SourceContext extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasFileName() => $_has(0);
   @$pb.TagNumber(1)
-  void clearFileName() => clearField(1);
+  void clearFileName() => $_clearField(1);
 }
 
 
diff --git a/lib/google/protobuf/source_context.pbenum.dart b/lib/google/protobuf/source_context.pbenum.dart
index ed40a1a..a57b0ad 100644
--- a/lib/google/protobuf/source_context.pbenum.dart
+++ b/lib/google/protobuf/source_context.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/source_context.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/google/protobuf/source_context.pbjson.dart b/lib/google/protobuf/source_context.pbjson.dart
index 998760d..c7629d9 100644
--- a/lib/google/protobuf/source_context.pbjson.dart
+++ b/lib/google/protobuf/source_context.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/source_context.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/google/protobuf/struct.pb.dart b/lib/google/protobuf/struct.pb.dart
index 07935dd..09fab6f 100644
--- a/lib/google/protobuf/struct.pb.dart
+++ b/lib/google/protobuf/struct.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/struct.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -16,6 +16,8 @@ import 'package:protobuf/src/protobuf/mixins/well_known.dart' as $mixin;
 
 import 'struct.pbenum.dart';
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 export 'struct.pbenum.dart';
 
 ///  `Struct` represents a structured data value, consisting of fields
@@ -28,7 +30,7 @@ export 'struct.pbenum.dart';
 ///  The JSON representation for `Struct` is JSON object.
 class Struct extends $pb.GeneratedMessage with $mixin.StructMixin {
   factory Struct({
-    $core.Map<$core.String, Value>? fields,
+    $pb.PbMap<$core.String, Value>? fields,
   }) {
     final $result = create();
     if (fields != null) {
@@ -68,7 +70,7 @@ class Struct extends $pb.GeneratedMessage with $mixin.StructMixin {
 
   /// Unordered map of dynamically typed values.
   @$pb.TagNumber(1)
-  $core.Map<$core.String, Value> get fields => $_getMap(0);
+  $pb.PbMap<$core.String, Value> get fields => $_getMap(0);
 }
 
 enum Value_Kind {
@@ -163,17 +165,17 @@ class Value extends $pb.GeneratedMessage with $mixin.ValueMixin {
   static Value? _defaultInstance;
 
   Value_Kind whichKind() => _Value_KindByTag[$_whichOneof(0)]!;
-  void clearKind() => clearField($_whichOneof(0));
+  void clearKind() => $_clearField($_whichOneof(0));
 
   /// Represents a null value.
   @$pb.TagNumber(1)
   NullValue get nullValue => $_getN(0);
   @$pb.TagNumber(1)
-  set nullValue(NullValue v) { setField(1, v); }
+  set nullValue(NullValue v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasNullValue() => $_has(0);
   @$pb.TagNumber(1)
-  void clearNullValue() => clearField(1);
+  void clearNullValue() => $_clearField(1);
 
   /// Represents a double value.
   @$pb.TagNumber(2)
@@ -183,7 +185,7 @@ class Value extends $pb.GeneratedMessage with $mixin.ValueMixin {
   @$pb.TagNumber(2)
   $core.bool hasNumberValue() => $_has(1);
   @$pb.TagNumber(2)
-  void clearNumberValue() => clearField(2);
+  void clearNumberValue() => $_clearField(2);
 
   /// Represents a string value.
   @$pb.TagNumber(3)
@@ -193,7 +195,7 @@ class Value extends $pb.GeneratedMessage with $mixin.ValueMixin {
   @$pb.TagNumber(3)
   $core.bool hasStringValue() => $_has(2);
   @$pb.TagNumber(3)
-  void clearStringValue() => clearField(3);
+  void clearStringValue() => $_clearField(3);
 
   /// Represents a boolean value.
   @$pb.TagNumber(4)
@@ -203,17 +205,17 @@ class Value extends $pb.GeneratedMessage with $mixin.ValueMixin {
   @$pb.TagNumber(4)
   $core.bool hasBoolValue() => $_has(3);
   @$pb.TagNumber(4)
-  void clearBoolValue() => clearField(4);
+  void clearBoolValue() => $_clearField(4);
 
   /// Represents a structured value.
   @$pb.TagNumber(5)
   Struct get structValue => $_getN(4);
   @$pb.TagNumber(5)
-  set structValue(Struct v) { setField(5, v); }
+  set structValue(Struct v) { $_setField(5, v); }
   @$pb.TagNumber(5)
   $core.bool hasStructValue() => $_has(4);
   @$pb.TagNumber(5)
-  void clearStructValue() => clearField(5);
+  void clearStructValue() => $_clearField(5);
   @$pb.TagNumber(5)
   Struct ensureStructValue() => $_ensure(4);
 
@@ -221,11 +223,11 @@ class Value extends $pb.GeneratedMessage with $mixin.ValueMixin {
   @$pb.TagNumber(6)
   ListValue get listValue => $_getN(5);
   @$pb.TagNumber(6)
-  set listValue(ListValue v) { setField(6, v); }
+  set listValue(ListValue v) { $_setField(6, v); }
   @$pb.TagNumber(6)
   $core.bool hasListValue() => $_has(5);
   @$pb.TagNumber(6)
-  void clearListValue() => clearField(6);
+  void clearListValue() => $_clearField(6);
   @$pb.TagNumber(6)
   ListValue ensureListValue() => $_ensure(5);
 }
@@ -275,7 +277,7 @@ class ListValue extends $pb.GeneratedMessage with $mixin.ListValueMixin {
 
   /// Repeated field of dynamically typed values.
   @$pb.TagNumber(1)
-  $core.List<Value> get values => $_getList(0);
+  $pb.PbList<Value> get values => $_getList(0);
 }
 
 
diff --git a/lib/google/protobuf/struct.pbenum.dart b/lib/google/protobuf/struct.pbenum.dart
index 4402b34..a71a36a 100644
--- a/lib/google/protobuf/struct.pbenum.dart
+++ b/lib/google/protobuf/struct.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/struct.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -18,6 +18,7 @@ import 'package:protobuf/protobuf.dart' as $pb;
 ///
 ///   The JSON representation for `NullValue` is JSON `null`.
 class NullValue extends $pb.ProtobufEnum {
+  /// Null value.
   static const NullValue NULL_VALUE = NullValue._(0, _omitEnumNames ? '' : 'NULL_VALUE');
 
   static const $core.List<NullValue> values = <NullValue> [
@@ -27,7 +28,7 @@ class NullValue extends $pb.ProtobufEnum {
   static final $core.Map<$core.int, NullValue> _byValue = $pb.ProtobufEnum.initByValue(values);
   static NullValue? valueOf($core.int value) => _byValue[value];
 
-  const NullValue._($core.int v, $core.String n) : super(v, n);
+  const NullValue._(super.v, super.n);
 }
 
 
diff --git a/lib/google/protobuf/struct.pbjson.dart b/lib/google/protobuf/struct.pbjson.dart
index ffa25fa..594067a 100644
--- a/lib/google/protobuf/struct.pbjson.dart
+++ b/lib/google/protobuf/struct.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/struct.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/google/protobuf/timestamp.pb.dart b/lib/google/protobuf/timestamp.pb.dart
index b90f582..4b10bac 100644
--- a/lib/google/protobuf/timestamp.pb.dart
+++ b/lib/google/protobuf/timestamp.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/timestamp.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -15,6 +15,8 @@ import 'package:fixnum/fixnum.dart' as $fixnum;
 import 'package:protobuf/protobuf.dart' as $pb;
 import 'package:protobuf/src/protobuf/mixins/well_known.dart' as $mixin;
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 ///  A Timestamp represents a point in time independent of any time zone or local
 ///  calendar, encoded as a count of seconds and fractions of seconds at
 ///  nanosecond resolution. The count is relative to an epoch at UTC midnight on
@@ -152,7 +154,7 @@ class Timestamp extends $pb.GeneratedMessage with $mixin.TimestampMixin {
   @$pb.TagNumber(1)
   $core.bool hasSeconds() => $_has(0);
   @$pb.TagNumber(1)
-  void clearSeconds() => clearField(1);
+  void clearSeconds() => $_clearField(1);
 
   /// Non-negative fractions of a second at nanosecond resolution. Negative
   /// second values with fractions must still have non-negative nanos values
@@ -165,7 +167,7 @@ class Timestamp extends $pb.GeneratedMessage with $mixin.TimestampMixin {
   @$pb.TagNumber(2)
   $core.bool hasNanos() => $_has(1);
   @$pb.TagNumber(2)
-  void clearNanos() => clearField(2);
+  void clearNanos() => $_clearField(2);
   /// Creates a new instance from [dateTime].
   ///
   /// Time zone information will not be preserved.
diff --git a/lib/google/protobuf/timestamp.pbenum.dart b/lib/google/protobuf/timestamp.pbenum.dart
index 30275f6..4a7bffe 100644
--- a/lib/google/protobuf/timestamp.pbenum.dart
+++ b/lib/google/protobuf/timestamp.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/timestamp.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/google/protobuf/timestamp.pbjson.dart b/lib/google/protobuf/timestamp.pbjson.dart
index 3dfd63b..3e2fcc9 100644
--- a/lib/google/protobuf/timestamp.pbjson.dart
+++ b/lib/google/protobuf/timestamp.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/timestamp.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/google/protobuf/type.pb.dart b/lib/google/protobuf/type.pb.dart
index 61e4e6a..5046ae6 100644
--- a/lib/google/protobuf/type.pb.dart
+++ b/lib/google/protobuf/type.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/type.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -17,6 +17,8 @@ import 'any.pb.dart' as $17;
 import 'source_context.pb.dart' as $18;
 import 'type.pbenum.dart';
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 export 'type.pbenum.dart';
 
 /// A protocol buffer message type.
@@ -93,29 +95,29 @@ class Type extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasName() => $_has(0);
   @$pb.TagNumber(1)
-  void clearName() => clearField(1);
+  void clearName() => $_clearField(1);
 
   /// The list of fields.
   @$pb.TagNumber(2)
-  $core.List<Field> get fields => $_getList(1);
+  $pb.PbList<Field> get fields => $_getList(1);
 
   /// The list of types appearing in `oneof` definitions in this type.
   @$pb.TagNumber(3)
-  $core.List<$core.String> get oneofs => $_getList(2);
+  $pb.PbList<$core.String> get oneofs => $_getList(2);
 
   /// The protocol buffer options.
   @$pb.TagNumber(4)
-  $core.List<Option> get options => $_getList(3);
+  $pb.PbList<Option> get options => $_getList(3);
 
   /// The source context.
   @$pb.TagNumber(5)
   $18.SourceContext get sourceContext => $_getN(4);
   @$pb.TagNumber(5)
-  set sourceContext($18.SourceContext v) { setField(5, v); }
+  set sourceContext($18.SourceContext v) { $_setField(5, v); }
   @$pb.TagNumber(5)
   $core.bool hasSourceContext() => $_has(4);
   @$pb.TagNumber(5)
-  void clearSourceContext() => clearField(5);
+  void clearSourceContext() => $_clearField(5);
   @$pb.TagNumber(5)
   $18.SourceContext ensureSourceContext() => $_ensure(4);
 
@@ -123,11 +125,11 @@ class Type extends $pb.GeneratedMessage {
   @$pb.TagNumber(6)
   Syntax get syntax => $_getN(5);
   @$pb.TagNumber(6)
-  set syntax(Syntax v) { setField(6, v); }
+  set syntax(Syntax v) { $_setField(6, v); }
   @$pb.TagNumber(6)
   $core.bool hasSyntax() => $_has(5);
   @$pb.TagNumber(6)
-  void clearSyntax() => clearField(6);
+  void clearSyntax() => $_clearField(6);
 }
 
 /// A single field of a message type.
@@ -220,21 +222,21 @@ class Field extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   Field_Kind get kind => $_getN(0);
   @$pb.TagNumber(1)
-  set kind(Field_Kind v) { setField(1, v); }
+  set kind(Field_Kind v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasKind() => $_has(0);
   @$pb.TagNumber(1)
-  void clearKind() => clearField(1);
+  void clearKind() => $_clearField(1);
 
   /// The field cardinality.
   @$pb.TagNumber(2)
   Field_Cardinality get cardinality => $_getN(1);
   @$pb.TagNumber(2)
-  set cardinality(Field_Cardinality v) { setField(2, v); }
+  set cardinality(Field_Cardinality v) { $_setField(2, v); }
   @$pb.TagNumber(2)
   $core.bool hasCardinality() => $_has(1);
   @$pb.TagNumber(2)
-  void clearCardinality() => clearField(2);
+  void clearCardinality() => $_clearField(2);
 
   /// The field number.
   @$pb.TagNumber(3)
@@ -244,7 +246,7 @@ class Field extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasNumber() => $_has(2);
   @$pb.TagNumber(3)
-  void clearNumber() => clearField(3);
+  void clearNumber() => $_clearField(3);
 
   /// The field name.
   @$pb.TagNumber(4)
@@ -254,7 +256,7 @@ class Field extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasName() => $_has(3);
   @$pb.TagNumber(4)
-  void clearName() => clearField(4);
+  void clearName() => $_clearField(4);
 
   /// The field type URL, without the scheme, for message or enumeration
   /// types. Example: `"type.googleapis.com/google.protobuf.Timestamp"`.
@@ -265,7 +267,7 @@ class Field extends $pb.GeneratedMessage {
   @$pb.TagNumber(6)
   $core.bool hasTypeUrl() => $_has(4);
   @$pb.TagNumber(6)
-  void clearTypeUrl() => clearField(6);
+  void clearTypeUrl() => $_clearField(6);
 
   /// The index of the field type in `Type.oneofs`, for message or enumeration
   /// types. The first type has index 1; zero means the type is not in the list.
@@ -276,7 +278,7 @@ class Field extends $pb.GeneratedMessage {
   @$pb.TagNumber(7)
   $core.bool hasOneofIndex() => $_has(5);
   @$pb.TagNumber(7)
-  void clearOneofIndex() => clearField(7);
+  void clearOneofIndex() => $_clearField(7);
 
   /// Whether to use alternative packed wire representation.
   @$pb.TagNumber(8)
@@ -286,11 +288,11 @@ class Field extends $pb.GeneratedMessage {
   @$pb.TagNumber(8)
   $core.bool hasPacked() => $_has(6);
   @$pb.TagNumber(8)
-  void clearPacked() => clearField(8);
+  void clearPacked() => $_clearField(8);
 
   /// The protocol buffer options.
   @$pb.TagNumber(9)
-  $core.List<Option> get options => $_getList(7);
+  $pb.PbList<Option> get options => $_getList(7);
 
   /// The field JSON name.
   @$pb.TagNumber(10)
@@ -300,7 +302,7 @@ class Field extends $pb.GeneratedMessage {
   @$pb.TagNumber(10)
   $core.bool hasJsonName() => $_has(8);
   @$pb.TagNumber(10)
-  void clearJsonName() => clearField(10);
+  void clearJsonName() => $_clearField(10);
 
   /// The string value of the default value of this field. Proto2 syntax only.
   @$pb.TagNumber(11)
@@ -310,7 +312,7 @@ class Field extends $pb.GeneratedMessage {
   @$pb.TagNumber(11)
   $core.bool hasDefaultValue() => $_has(9);
   @$pb.TagNumber(11)
-  void clearDefaultValue() => clearField(11);
+  void clearDefaultValue() => $_clearField(11);
 }
 
 /// Enum type definition.
@@ -382,25 +384,25 @@ class Enum extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasName() => $_has(0);
   @$pb.TagNumber(1)
-  void clearName() => clearField(1);
+  void clearName() => $_clearField(1);
 
   /// Enum value definitions.
   @$pb.TagNumber(2)
-  $core.List<EnumValue> get enumvalue => $_getList(1);
+  $pb.PbList<EnumValue> get enumvalue => $_getList(1);
 
   /// Protocol buffer options.
   @$pb.TagNumber(3)
-  $core.List<Option> get options => $_getList(2);
+  $pb.PbList<Option> get options => $_getList(2);
 
   /// The source context.
   @$pb.TagNumber(4)
   $18.SourceContext get sourceContext => $_getN(3);
   @$pb.TagNumber(4)
-  set sourceContext($18.SourceContext v) { setField(4, v); }
+  set sourceContext($18.SourceContext v) { $_setField(4, v); }
   @$pb.TagNumber(4)
   $core.bool hasSourceContext() => $_has(3);
   @$pb.TagNumber(4)
-  void clearSourceContext() => clearField(4);
+  void clearSourceContext() => $_clearField(4);
   @$pb.TagNumber(4)
   $18.SourceContext ensureSourceContext() => $_ensure(3);
 
@@ -408,11 +410,11 @@ class Enum extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   Syntax get syntax => $_getN(4);
   @$pb.TagNumber(5)
-  set syntax(Syntax v) { setField(5, v); }
+  set syntax(Syntax v) { $_setField(5, v); }
   @$pb.TagNumber(5)
   $core.bool hasSyntax() => $_has(4);
   @$pb.TagNumber(5)
-  void clearSyntax() => clearField(5);
+  void clearSyntax() => $_clearField(5);
 }
 
 /// Enum value definition.
@@ -474,7 +476,7 @@ class EnumValue extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasName() => $_has(0);
   @$pb.TagNumber(1)
-  void clearName() => clearField(1);
+  void clearName() => $_clearField(1);
 
   /// Enum value number.
   @$pb.TagNumber(2)
@@ -484,11 +486,11 @@ class EnumValue extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasNumber() => $_has(1);
   @$pb.TagNumber(2)
-  void clearNumber() => clearField(2);
+  void clearNumber() => $_clearField(2);
 
   /// Protocol buffer options.
   @$pb.TagNumber(3)
-  $core.List<Option> get options => $_getList(2);
+  $pb.PbList<Option> get options => $_getList(2);
 }
 
 /// A protocol buffer option, which can be attached to a message, field,
@@ -549,7 +551,7 @@ class Option extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasName() => $_has(0);
   @$pb.TagNumber(1)
-  void clearName() => clearField(1);
+  void clearName() => $_clearField(1);
 
   /// The option's value packed in an Any message. If the value is a primitive,
   /// the corresponding wrapper type defined in google/protobuf/wrappers.proto
@@ -558,11 +560,11 @@ class Option extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $17.Any get value => $_getN(1);
   @$pb.TagNumber(2)
-  set value($17.Any v) { setField(2, v); }
+  set value($17.Any v) { $_setField(2, v); }
   @$pb.TagNumber(2)
   $core.bool hasValue() => $_has(1);
   @$pb.TagNumber(2)
-  void clearValue() => clearField(2);
+  void clearValue() => $_clearField(2);
   @$pb.TagNumber(2)
   $17.Any ensureValue() => $_ensure(1);
 }
diff --git a/lib/google/protobuf/type.pbenum.dart b/lib/google/protobuf/type.pbenum.dart
index a1f2d6e..5c52845 100644
--- a/lib/google/protobuf/type.pbenum.dart
+++ b/lib/google/protobuf/type.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/type.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -15,7 +15,9 @@ import 'package:protobuf/protobuf.dart' as $pb;
 
 /// The syntax in which a protocol buffer element is defined.
 class Syntax extends $pb.ProtobufEnum {
+  /// Syntax `proto2`.
   static const Syntax SYNTAX_PROTO2 = Syntax._(0, _omitEnumNames ? '' : 'SYNTAX_PROTO2');
+  /// Syntax `proto3`.
   static const Syntax SYNTAX_PROTO3 = Syntax._(1, _omitEnumNames ? '' : 'SYNTAX_PROTO3');
 
   static const $core.List<Syntax> values = <Syntax> [
@@ -26,29 +28,48 @@ class Syntax extends $pb.ProtobufEnum {
   static final $core.Map<$core.int, Syntax> _byValue = $pb.ProtobufEnum.initByValue(values);
   static Syntax? valueOf($core.int value) => _byValue[value];
 
-  const Syntax._($core.int v, $core.String n) : super(v, n);
+  const Syntax._(super.v, super.n);
 }
 
 /// Basic field types.
 class Field_Kind extends $pb.ProtobufEnum {
+  /// Field type unknown.
   static const Field_Kind TYPE_UNKNOWN = Field_Kind._(0, _omitEnumNames ? '' : 'TYPE_UNKNOWN');
+  /// Field type double.
   static const Field_Kind TYPE_DOUBLE = Field_Kind._(1, _omitEnumNames ? '' : 'TYPE_DOUBLE');
+  /// Field type float.
   static const Field_Kind TYPE_FLOAT = Field_Kind._(2, _omitEnumNames ? '' : 'TYPE_FLOAT');
+  /// Field type int64.
   static const Field_Kind TYPE_INT64 = Field_Kind._(3, _omitEnumNames ? '' : 'TYPE_INT64');
+  /// Field type uint64.
   static const Field_Kind TYPE_UINT64 = Field_Kind._(4, _omitEnumNames ? '' : 'TYPE_UINT64');
+  /// Field type int32.
   static const Field_Kind TYPE_INT32 = Field_Kind._(5, _omitEnumNames ? '' : 'TYPE_INT32');
+  /// Field type fixed64.
   static const Field_Kind TYPE_FIXED64 = Field_Kind._(6, _omitEnumNames ? '' : 'TYPE_FIXED64');
+  /// Field type fixed32.
   static const Field_Kind TYPE_FIXED32 = Field_Kind._(7, _omitEnumNames ? '' : 'TYPE_FIXED32');
+  /// Field type bool.
   static const Field_Kind TYPE_BOOL = Field_Kind._(8, _omitEnumNames ? '' : 'TYPE_BOOL');
+  /// Field type string.
   static const Field_Kind TYPE_STRING = Field_Kind._(9, _omitEnumNames ? '' : 'TYPE_STRING');
+  /// Field type group. Proto2 syntax only, and deprecated.
   static const Field_Kind TYPE_GROUP = Field_Kind._(10, _omitEnumNames ? '' : 'TYPE_GROUP');
+  /// Field type message.
   static const Field_Kind TYPE_MESSAGE = Field_Kind._(11, _omitEnumNames ? '' : 'TYPE_MESSAGE');
+  /// Field type bytes.
   static const Field_Kind TYPE_BYTES = Field_Kind._(12, _omitEnumNames ? '' : 'TYPE_BYTES');
+  /// Field type uint32.
   static const Field_Kind TYPE_UINT32 = Field_Kind._(13, _omitEnumNames ? '' : 'TYPE_UINT32');
+  /// Field type enum.
   static const Field_Kind TYPE_ENUM = Field_Kind._(14, _omitEnumNames ? '' : 'TYPE_ENUM');
+  /// Field type sfixed32.
   static const Field_Kind TYPE_SFIXED32 = Field_Kind._(15, _omitEnumNames ? '' : 'TYPE_SFIXED32');
+  /// Field type sfixed64.
   static const Field_Kind TYPE_SFIXED64 = Field_Kind._(16, _omitEnumNames ? '' : 'TYPE_SFIXED64');
+  /// Field type sint32.
   static const Field_Kind TYPE_SINT32 = Field_Kind._(17, _omitEnumNames ? '' : 'TYPE_SINT32');
+  /// Field type sint64.
   static const Field_Kind TYPE_SINT64 = Field_Kind._(18, _omitEnumNames ? '' : 'TYPE_SINT64');
 
   static const $core.List<Field_Kind> values = <Field_Kind> [
@@ -76,14 +97,18 @@ class Field_Kind extends $pb.ProtobufEnum {
   static final $core.Map<$core.int, Field_Kind> _byValue = $pb.ProtobufEnum.initByValue(values);
   static Field_Kind? valueOf($core.int value) => _byValue[value];
 
-  const Field_Kind._($core.int v, $core.String n) : super(v, n);
+  const Field_Kind._(super.v, super.n);
 }
 
 /// Whether a field is optional, required, or repeated.
 class Field_Cardinality extends $pb.ProtobufEnum {
+  /// For fields with unknown cardinality.
   static const Field_Cardinality CARDINALITY_UNKNOWN = Field_Cardinality._(0, _omitEnumNames ? '' : 'CARDINALITY_UNKNOWN');
+  /// For optional fields.
   static const Field_Cardinality CARDINALITY_OPTIONAL = Field_Cardinality._(1, _omitEnumNames ? '' : 'CARDINALITY_OPTIONAL');
+  /// For required fields. Proto2 syntax only.
   static const Field_Cardinality CARDINALITY_REQUIRED = Field_Cardinality._(2, _omitEnumNames ? '' : 'CARDINALITY_REQUIRED');
+  /// For repeated fields.
   static const Field_Cardinality CARDINALITY_REPEATED = Field_Cardinality._(3, _omitEnumNames ? '' : 'CARDINALITY_REPEATED');
 
   static const $core.List<Field_Cardinality> values = <Field_Cardinality> [
@@ -96,7 +121,7 @@ class Field_Cardinality extends $pb.ProtobufEnum {
   static final $core.Map<$core.int, Field_Cardinality> _byValue = $pb.ProtobufEnum.initByValue(values);
   static Field_Cardinality? valueOf($core.int value) => _byValue[value];
 
-  const Field_Cardinality._($core.int v, $core.String n) : super(v, n);
+  const Field_Cardinality._(super.v, super.n);
 }
 
 
diff --git a/lib/google/protobuf/type.pbjson.dart b/lib/google/protobuf/type.pbjson.dart
index 0371466..f1698b2 100644
--- a/lib/google/protobuf/type.pbjson.dart
+++ b/lib/google/protobuf/type.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/type.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/google/protobuf/wrappers.pb.dart b/lib/google/protobuf/wrappers.pb.dart
index 7ff6e08..b1dab34 100644
--- a/lib/google/protobuf/wrappers.pb.dart
+++ b/lib/google/protobuf/wrappers.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/wrappers.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -15,6 +15,8 @@ import 'package:fixnum/fixnum.dart' as $fixnum;
 import 'package:protobuf/protobuf.dart' as $pb;
 import 'package:protobuf/src/protobuf/mixins/well_known.dart' as $mixin;
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 ///  Wrapper message for `double`.
 ///
 ///  The JSON representation for `DoubleValue` is JSON number.
@@ -66,7 +68,7 @@ class DoubleValue extends $pb.GeneratedMessage with $mixin.DoubleValueMixin {
   @$pb.TagNumber(1)
   $core.bool hasValue() => $_has(0);
   @$pb.TagNumber(1)
-  void clearValue() => clearField(1);
+  void clearValue() => $_clearField(1);
 }
 
 ///  Wrapper message for `float`.
@@ -120,7 +122,7 @@ class FloatValue extends $pb.GeneratedMessage with $mixin.FloatValueMixin {
   @$pb.TagNumber(1)
   $core.bool hasValue() => $_has(0);
   @$pb.TagNumber(1)
-  void clearValue() => clearField(1);
+  void clearValue() => $_clearField(1);
 }
 
 ///  Wrapper message for `int64`.
@@ -174,7 +176,7 @@ class Int64Value extends $pb.GeneratedMessage with $mixin.Int64ValueMixin {
   @$pb.TagNumber(1)
   $core.bool hasValue() => $_has(0);
   @$pb.TagNumber(1)
-  void clearValue() => clearField(1);
+  void clearValue() => $_clearField(1);
 }
 
 ///  Wrapper message for `uint64`.
@@ -228,7 +230,7 @@ class UInt64Value extends $pb.GeneratedMessage with $mixin.UInt64ValueMixin {
   @$pb.TagNumber(1)
   $core.bool hasValue() => $_has(0);
   @$pb.TagNumber(1)
-  void clearValue() => clearField(1);
+  void clearValue() => $_clearField(1);
 }
 
 ///  Wrapper message for `int32`.
@@ -282,7 +284,7 @@ class Int32Value extends $pb.GeneratedMessage with $mixin.Int32ValueMixin {
   @$pb.TagNumber(1)
   $core.bool hasValue() => $_has(0);
   @$pb.TagNumber(1)
-  void clearValue() => clearField(1);
+  void clearValue() => $_clearField(1);
 }
 
 ///  Wrapper message for `uint32`.
@@ -336,7 +338,7 @@ class UInt32Value extends $pb.GeneratedMessage with $mixin.UInt32ValueMixin {
   @$pb.TagNumber(1)
   $core.bool hasValue() => $_has(0);
   @$pb.TagNumber(1)
-  void clearValue() => clearField(1);
+  void clearValue() => $_clearField(1);
 }
 
 ///  Wrapper message for `bool`.
@@ -390,7 +392,7 @@ class BoolValue extends $pb.GeneratedMessage with $mixin.BoolValueMixin {
   @$pb.TagNumber(1)
   $core.bool hasValue() => $_has(0);
   @$pb.TagNumber(1)
-  void clearValue() => clearField(1);
+  void clearValue() => $_clearField(1);
 }
 
 ///  Wrapper message for `string`.
@@ -444,7 +446,7 @@ class StringValue extends $pb.GeneratedMessage with $mixin.StringValueMixin {
   @$pb.TagNumber(1)
   $core.bool hasValue() => $_has(0);
   @$pb.TagNumber(1)
-  void clearValue() => clearField(1);
+  void clearValue() => $_clearField(1);
 }
 
 ///  Wrapper message for `bytes`.
@@ -498,7 +500,7 @@ class BytesValue extends $pb.GeneratedMessage with $mixin.BytesValueMixin {
   @$pb.TagNumber(1)
   $core.bool hasValue() => $_has(0);
   @$pb.TagNumber(1)
-  void clearValue() => clearField(1);
+  void clearValue() => $_clearField(1);
 }
 
 
diff --git a/lib/google/protobuf/wrappers.pbenum.dart b/lib/google/protobuf/wrappers.pbenum.dart
index 68f33ec..3a35b20 100644
--- a/lib/google/protobuf/wrappers.pbenum.dart
+++ b/lib/google/protobuf/wrappers.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/wrappers.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/google/protobuf/wrappers.pbjson.dart b/lib/google/protobuf/wrappers.pbjson.dart
index c30acdb..e8a197e 100644
--- a/lib/google/protobuf/wrappers.pbjson.dart
+++ b/lib/google/protobuf/wrappers.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/protobuf/wrappers.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/google/rpc/code.pb.dart b/lib/google/rpc/code.pb.dart
index f6f1579..e8e74ec 100644
--- a/lib/google/rpc/code.pb.dart
+++ b/lib/google/rpc/code.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/rpc/code.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -11,5 +11,7 @@
 
 import 'dart:core' as $core;
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 export 'code.pbenum.dart';
 
diff --git a/lib/google/rpc/code.pbenum.dart b/lib/google/rpc/code.pbenum.dart
index 8fb80d2..dc44c8f 100644
--- a/lib/google/rpc/code.pbenum.dart
+++ b/lib/google/rpc/code.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/rpc/code.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -21,22 +21,141 @@ import 'package:protobuf/protobuf.dart' as $pb;
 ///  `OUT_OF_RANGE` over `FAILED_PRECONDITION` if both codes apply.
 ///  Similarly prefer `NOT_FOUND` or `ALREADY_EXISTS` over `FAILED_PRECONDITION`.
 class Code extends $pb.ProtobufEnum {
+  ///  Not an error; returned on success
+  ///
+  ///  HTTP Mapping: 200 OK
   static const Code OK = Code._(0, _omitEnumNames ? '' : 'OK');
+  ///  The operation was cancelled, typically by the caller.
+  ///
+  ///  HTTP Mapping: 499 Client Closed Request
   static const Code CANCELLED = Code._(1, _omitEnumNames ? '' : 'CANCELLED');
+  ///  Unknown error.  For example, this error may be returned when
+  ///  a `Status` value received from another address space belongs to
+  ///  an error space that is not known in this address space.  Also
+  ///  errors raised by APIs that do not return enough error information
+  ///  may be converted to this error.
+  ///
+  ///  HTTP Mapping: 500 Internal Server Error
   static const Code UNKNOWN = Code._(2, _omitEnumNames ? '' : 'UNKNOWN');
+  ///  The client specified an invalid argument.  Note that this differs
+  ///  from `FAILED_PRECONDITION`.  `INVALID_ARGUMENT` indicates arguments
+  ///  that are problematic regardless of the state of the system
+  ///  (e.g., a malformed file name).
+  ///
+  ///  HTTP Mapping: 400 Bad Request
   static const Code INVALID_ARGUMENT = Code._(3, _omitEnumNames ? '' : 'INVALID_ARGUMENT');
+  ///  The deadline expired before the operation could complete. For operations
+  ///  that change the state of the system, this error may be returned
+  ///  even if the operation has completed successfully.  For example, a
+  ///  successful response from a server could have been delayed long
+  ///  enough for the deadline to expire.
+  ///
+  ///  HTTP Mapping: 504 Gateway Timeout
   static const Code DEADLINE_EXCEEDED = Code._(4, _omitEnumNames ? '' : 'DEADLINE_EXCEEDED');
+  ///  Some requested entity (e.g., file or directory) was not found.
+  ///
+  ///  Note to server developers: if a request is denied for an entire class
+  ///  of users, such as gradual feature rollout or undocumented whitelist,
+  ///  `NOT_FOUND` may be used. If a request is denied for some users within
+  ///  a class of users, such as user-based access control, `PERMISSION_DENIED`
+  ///  must be used.
+  ///
+  ///  HTTP Mapping: 404 Not Found
   static const Code NOT_FOUND = Code._(5, _omitEnumNames ? '' : 'NOT_FOUND');
+  ///  The entity that a client attempted to create (e.g., file or directory)
+  ///  already exists.
+  ///
+  ///  HTTP Mapping: 409 Conflict
   static const Code ALREADY_EXISTS = Code._(6, _omitEnumNames ? '' : 'ALREADY_EXISTS');
+  ///  The caller does not have permission to execute the specified
+  ///  operation. `PERMISSION_DENIED` must not be used for rejections
+  ///  caused by exhausting some resource (use `RESOURCE_EXHAUSTED`
+  ///  instead for those errors). `PERMISSION_DENIED` must not be
+  ///  used if the caller can not be identified (use `UNAUTHENTICATED`
+  ///  instead for those errors). This error code does not imply the
+  ///  request is valid or the requested entity exists or satisfies
+  ///  other pre-conditions.
+  ///
+  ///  HTTP Mapping: 403 Forbidden
   static const Code PERMISSION_DENIED = Code._(7, _omitEnumNames ? '' : 'PERMISSION_DENIED');
+  ///  The request does not have valid authentication credentials for the
+  ///  operation.
+  ///
+  ///  HTTP Mapping: 401 Unauthorized
   static const Code UNAUTHENTICATED = Code._(16, _omitEnumNames ? '' : 'UNAUTHENTICATED');
+  ///  Some resource has been exhausted, perhaps a per-user quota, or
+  ///  perhaps the entire file system is out of space.
+  ///
+  ///  HTTP Mapping: 429 Too Many Requests
   static const Code RESOURCE_EXHAUSTED = Code._(8, _omitEnumNames ? '' : 'RESOURCE_EXHAUSTED');
+  ///  The operation was rejected because the system is not in a state
+  ///  required for the operation's execution.  For example, the directory
+  ///  to be deleted is non-empty, an rmdir operation is applied to
+  ///  a non-directory, etc.
+  ///
+  ///  Service implementors can use the following guidelines to decide
+  ///  between `FAILED_PRECONDITION`, `ABORTED`, and `UNAVAILABLE`:
+  ///   (a) Use `UNAVAILABLE` if the client can retry just the failing call.
+  ///   (b) Use `ABORTED` if the client should retry at a higher level
+  ///       (e.g., when a client-specified test-and-set fails, indicating the
+  ///       client should restart a read-modify-write sequence).
+  ///   (c) Use `FAILED_PRECONDITION` if the client should not retry until
+  ///       the system state has been explicitly fixed.  E.g., if an "rmdir"
+  ///       fails because the directory is non-empty, `FAILED_PRECONDITION`
+  ///       should be returned since the client should not retry unless
+  ///       the files are deleted from the directory.
+  ///
+  ///  HTTP Mapping: 400 Bad Request
   static const Code FAILED_PRECONDITION = Code._(9, _omitEnumNames ? '' : 'FAILED_PRECONDITION');
+  ///  The operation was aborted, typically due to a concurrency issue such as
+  ///  a sequencer check failure or transaction abort.
+  ///
+  ///  See the guidelines above for deciding between `FAILED_PRECONDITION`,
+  ///  `ABORTED`, and `UNAVAILABLE`.
+  ///
+  ///  HTTP Mapping: 409 Conflict
   static const Code ABORTED = Code._(10, _omitEnumNames ? '' : 'ABORTED');
+  ///  The operation was attempted past the valid range.  E.g., seeking or
+  ///  reading past end-of-file.
+  ///
+  ///  Unlike `INVALID_ARGUMENT`, this error indicates a problem that may
+  ///  be fixed if the system state changes. For example, a 32-bit file
+  ///  system will generate `INVALID_ARGUMENT` if asked to read at an
+  ///  offset that is not in the range [0,2^32-1], but it will generate
+  ///  `OUT_OF_RANGE` if asked to read from an offset past the current
+  ///  file size.
+  ///
+  ///  There is a fair bit of overlap between `FAILED_PRECONDITION` and
+  ///  `OUT_OF_RANGE`.  We recommend using `OUT_OF_RANGE` (the more specific
+  ///  error) when it applies so that callers who are iterating through
+  ///  a space can easily look for an `OUT_OF_RANGE` error to detect when
+  ///  they are done.
+  ///
+  ///  HTTP Mapping: 400 Bad Request
   static const Code OUT_OF_RANGE = Code._(11, _omitEnumNames ? '' : 'OUT_OF_RANGE');
+  ///  The operation is not implemented or is not supported/enabled in this
+  ///  service.
+  ///
+  ///  HTTP Mapping: 501 Not Implemented
   static const Code UNIMPLEMENTED = Code._(12, _omitEnumNames ? '' : 'UNIMPLEMENTED');
+  ///  Internal errors.  This means that some invariants expected by the
+  ///  underlying system have been broken.  This error code is reserved
+  ///  for serious errors.
+  ///
+  ///  HTTP Mapping: 500 Internal Server Error
   static const Code INTERNAL = Code._(13, _omitEnumNames ? '' : 'INTERNAL');
+  ///  The service is currently unavailable.  This is most likely a
+  ///  transient condition, which can be corrected by retrying with
+  ///  a backoff.
+  ///
+  ///  See the guidelines above for deciding between `FAILED_PRECONDITION`,
+  ///  `ABORTED`, and `UNAVAILABLE`.
+  ///
+  ///  HTTP Mapping: 503 Service Unavailable
   static const Code UNAVAILABLE = Code._(14, _omitEnumNames ? '' : 'UNAVAILABLE');
+  ///  Unrecoverable data loss or corruption.
+  ///
+  ///  HTTP Mapping: 500 Internal Server Error
   static const Code DATA_LOSS = Code._(15, _omitEnumNames ? '' : 'DATA_LOSS');
 
   static const $core.List<Code> values = <Code> [
@@ -62,7 +181,7 @@ class Code extends $pb.ProtobufEnum {
   static final $core.Map<$core.int, Code> _byValue = $pb.ProtobufEnum.initByValue(values);
   static Code? valueOf($core.int value) => _byValue[value];
 
-  const Code._($core.int v, $core.String n) : super(v, n);
+  const Code._(super.v, super.n);
 }
 
 
diff --git a/lib/google/rpc/code.pbjson.dart b/lib/google/rpc/code.pbjson.dart
index 79f111b..46ff9ba 100644
--- a/lib/google/rpc/code.pbjson.dart
+++ b/lib/google/rpc/code.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/rpc/code.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/google/rpc/error_details.pb.dart b/lib/google/rpc/error_details.pb.dart
index 3565682..ad7479e 100644
--- a/lib/google/rpc/error_details.pb.dart
+++ b/lib/google/rpc/error_details.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/rpc/error_details.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -15,6 +15,8 @@ import 'package:protobuf/protobuf.dart' as $pb;
 
 import '../protobuf/duration.pb.dart' as $13;
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 ///  Describes when the clients can retry a failed request. Clients could ignore
 ///  the recommendation here or retry when this information is missing from error
 ///  responses.
@@ -72,11 +74,11 @@ class RetryInfo extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $13.Duration get retryDelay => $_getN(0);
   @$pb.TagNumber(1)
-  set retryDelay($13.Duration v) { setField(1, v); }
+  set retryDelay($13.Duration v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasRetryDelay() => $_has(0);
   @$pb.TagNumber(1)
-  void clearRetryDelay() => clearField(1);
+  void clearRetryDelay() => $_clearField(1);
   @$pb.TagNumber(1)
   $13.Duration ensureRetryDelay() => $_ensure(0);
 }
@@ -129,7 +131,7 @@ class DebugInfo extends $pb.GeneratedMessage {
 
   /// The stack trace entries indicating where the error occurred.
   @$pb.TagNumber(1)
-  $core.List<$core.String> get stackEntries => $_getList(0);
+  $pb.PbList<$core.String> get stackEntries => $_getList(0);
 
   /// Additional debugging information provided by the server.
   @$pb.TagNumber(2)
@@ -139,7 +141,7 @@ class DebugInfo extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasDetail() => $_has(1);
   @$pb.TagNumber(2)
-  void clearDetail() => clearField(2);
+  void clearDetail() => $_clearField(2);
 }
 
 /// A message type used to describe a single quota violation.  For example, a
@@ -199,7 +201,7 @@ class QuotaFailure_Violation extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasSubject() => $_has(0);
   @$pb.TagNumber(1)
-  void clearSubject() => clearField(1);
+  void clearSubject() => $_clearField(1);
 
   ///  A description of how the quota check failed. Clients can use this
   ///  description to find more about the quota configuration in the service's
@@ -215,7 +217,7 @@ class QuotaFailure_Violation extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasDescription() => $_has(1);
   @$pb.TagNumber(2)
-  void clearDescription() => clearField(2);
+  void clearDescription() => $_clearField(2);
 }
 
 ///  Describes how a quota check failed.
@@ -271,7 +273,7 @@ class QuotaFailure extends $pb.GeneratedMessage {
 
   /// Describes all quota violations.
   @$pb.TagNumber(1)
-  $core.List<QuotaFailure_Violation> get violations => $_getList(0);
+  $pb.PbList<QuotaFailure_Violation> get violations => $_getList(0);
 }
 
 /// A message type used to describe a single precondition failure.
@@ -335,7 +337,7 @@ class PreconditionFailure_Violation extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasType() => $_has(0);
   @$pb.TagNumber(1)
-  void clearType() => clearField(1);
+  void clearType() => $_clearField(1);
 
   /// The subject, relative to the type, that failed.
   /// For example, "google.com/cloud" relative to the "TOS" type would
@@ -347,7 +349,7 @@ class PreconditionFailure_Violation extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasSubject() => $_has(1);
   @$pb.TagNumber(2)
-  void clearSubject() => clearField(2);
+  void clearSubject() => $_clearField(2);
 
   ///  A description of how the precondition failed. Developers can use this
   ///  description to understand how to fix the failure.
@@ -360,7 +362,7 @@ class PreconditionFailure_Violation extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasDescription() => $_has(2);
   @$pb.TagNumber(3)
-  void clearDescription() => clearField(3);
+  void clearDescription() => $_clearField(3);
 }
 
 ///  Describes what preconditions have failed.
@@ -410,7 +412,7 @@ class PreconditionFailure extends $pb.GeneratedMessage {
 
   /// Describes all precondition violations.
   @$pb.TagNumber(1)
-  $core.List<PreconditionFailure_Violation> get violations => $_getList(0);
+  $pb.PbList<PreconditionFailure_Violation> get violations => $_getList(0);
 }
 
 /// A message type used to describe a single bad request field.
@@ -469,7 +471,7 @@ class BadRequest_FieldViolation extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasField_1() => $_has(0);
   @$pb.TagNumber(1)
-  void clearField_1() => clearField(1);
+  void clearField_1() => $_clearField(1);
 
   /// A description of why the request element is bad.
   @$pb.TagNumber(2)
@@ -479,7 +481,7 @@ class BadRequest_FieldViolation extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasDescription() => $_has(1);
   @$pb.TagNumber(2)
-  void clearDescription() => clearField(2);
+  void clearDescription() => $_clearField(2);
 }
 
 /// Describes violations in a client request. This error type focuses on the
@@ -526,7 +528,7 @@ class BadRequest extends $pb.GeneratedMessage {
 
   /// Describes all violations in a client request.
   @$pb.TagNumber(1)
-  $core.List<BadRequest_FieldViolation> get fieldViolations => $_getList(0);
+  $pb.PbList<BadRequest_FieldViolation> get fieldViolations => $_getList(0);
 }
 
 /// Contains metadata about the request that clients can attach when filing a bug
@@ -585,7 +587,7 @@ class RequestInfo extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasRequestId() => $_has(0);
   @$pb.TagNumber(1)
-  void clearRequestId() => clearField(1);
+  void clearRequestId() => $_clearField(1);
 
   /// Any data that was used to serve this request. For example, an encrypted
   /// stack trace that can be sent back to the service provider for debugging.
@@ -596,7 +598,7 @@ class RequestInfo extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasServingData() => $_has(1);
   @$pb.TagNumber(2)
-  void clearServingData() => clearField(2);
+  void clearServingData() => $_clearField(2);
 }
 
 /// Describes the resource that is being accessed.
@@ -665,7 +667,7 @@ class ResourceInfo extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasResourceType() => $_has(0);
   @$pb.TagNumber(1)
-  void clearResourceType() => clearField(1);
+  void clearResourceType() => $_clearField(1);
 
   /// The name of the resource being accessed.  For example, a shared calendar
   /// name: "example.com_4fghdhgsrgh@group.calendar.google.com", if the current
@@ -677,7 +679,7 @@ class ResourceInfo extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasResourceName() => $_has(1);
   @$pb.TagNumber(2)
-  void clearResourceName() => clearField(2);
+  void clearResourceName() => $_clearField(2);
 
   /// The owner of the resource (optional).
   /// For example, "user:<owner email>" or "project:<Google developer project
@@ -689,7 +691,7 @@ class ResourceInfo extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasOwner() => $_has(2);
   @$pb.TagNumber(3)
-  void clearOwner() => clearField(3);
+  void clearOwner() => $_clearField(3);
 
   /// Describes what error is encountered when accessing this resource.
   /// For example, updating a cloud project may require the `writer` permission
@@ -701,7 +703,7 @@ class ResourceInfo extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasDescription() => $_has(3);
   @$pb.TagNumber(4)
-  void clearDescription() => clearField(4);
+  void clearDescription() => $_clearField(4);
 }
 
 /// Describes a URL link.
@@ -758,7 +760,7 @@ class Help_Link extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasDescription() => $_has(0);
   @$pb.TagNumber(1)
-  void clearDescription() => clearField(1);
+  void clearDescription() => $_clearField(1);
 
   /// The URL of the link.
   @$pb.TagNumber(2)
@@ -768,7 +770,7 @@ class Help_Link extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasUrl() => $_has(1);
   @$pb.TagNumber(2)
-  void clearUrl() => clearField(2);
+  void clearUrl() => $_clearField(2);
 }
 
 ///  Provides links to documentation or for performing an out of band action.
@@ -818,7 +820,7 @@ class Help extends $pb.GeneratedMessage {
 
   /// URL(s) pointing to additional information on handling the current error.
   @$pb.TagNumber(1)
-  $core.List<Help_Link> get links => $_getList(0);
+  $pb.PbList<Help_Link> get links => $_getList(0);
 }
 
 /// Provides a localized error message that is safe to return to the user
@@ -878,7 +880,7 @@ class LocalizedMessage extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasLocale() => $_has(0);
   @$pb.TagNumber(1)
-  void clearLocale() => clearField(1);
+  void clearLocale() => $_clearField(1);
 
   /// The localized error message in the above locale.
   @$pb.TagNumber(2)
@@ -888,7 +890,7 @@ class LocalizedMessage extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasMessage() => $_has(1);
   @$pb.TagNumber(2)
-  void clearMessage() => clearField(2);
+  void clearMessage() => $_clearField(2);
 }
 
 
diff --git a/lib/google/rpc/error_details.pbenum.dart b/lib/google/rpc/error_details.pbenum.dart
index 5756f8a..2df69f1 100644
--- a/lib/google/rpc/error_details.pbenum.dart
+++ b/lib/google/rpc/error_details.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/rpc/error_details.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/google/rpc/error_details.pbjson.dart b/lib/google/rpc/error_details.pbjson.dart
index d178e2a..a6dce1c 100644
--- a/lib/google/rpc/error_details.pbjson.dart
+++ b/lib/google/rpc/error_details.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/rpc/error_details.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/google/rpc/status.pb.dart b/lib/google/rpc/status.pb.dart
index aaa7905..f24ffa5 100644
--- a/lib/google/rpc/status.pb.dart
+++ b/lib/google/rpc/status.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/rpc/status.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -15,6 +15,8 @@ import 'package:protobuf/protobuf.dart' as $pb;
 
 import '../protobuf/any.pb.dart' as $17;
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 ///  The `Status` type defines a logical error model that is suitable for different
 ///  programming environments, including REST APIs and RPC APIs. It is used by
 ///  [gRPC](https://github.com/grpc). The error model is designed to be:
@@ -125,7 +127,7 @@ class Status extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasCode() => $_has(0);
   @$pb.TagNumber(1)
-  void clearCode() => clearField(1);
+  void clearCode() => $_clearField(1);
 
   /// A developer-facing error message, which should be in English. Any
   /// user-facing error message should be localized and sent in the
@@ -137,12 +139,12 @@ class Status extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasMessage() => $_has(1);
   @$pb.TagNumber(2)
-  void clearMessage() => clearField(2);
+  void clearMessage() => $_clearField(2);
 
   /// A list of messages that carry the error details.  There is a common set of
   /// message types for APIs to use.
   @$pb.TagNumber(3)
-  $core.List<$17.Any> get details => $_getList(2);
+  $pb.PbList<$17.Any> get details => $_getList(2);
 }
 
 
diff --git a/lib/google/rpc/status.pbenum.dart b/lib/google/rpc/status.pbenum.dart
index 3777628..194b18b 100644
--- a/lib/google/rpc/status.pbenum.dart
+++ b/lib/google/rpc/status.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/rpc/status.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/google/rpc/status.pbjson.dart b/lib/google/rpc/status.pbjson.dart
index ccf6edf..45fc27d 100644
--- a/lib/google/rpc/status.pbjson.dart
+++ b/lib/google/rpc/status.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: google/rpc/status.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/openapiv2.pb.dart b/lib/openapiv2.pb.dart
index 6d31773..d4b54cc 100644
--- a/lib/openapiv2.pb.dart
+++ b/lib/openapiv2.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: openapiv2.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -17,6 +17,8 @@ import 'package:protobuf/protobuf.dart' as $pb;
 import 'google/protobuf/struct.pb.dart' as $11;
 import 'openapiv2.pbenum.dart';
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 export 'openapiv2.pbenum.dart';
 
 ///  `Swagger` is a representation of OpenAPI v2 specification's Swagger object.
@@ -53,11 +55,11 @@ class Swagger extends $pb.GeneratedMessage {
     $core.Iterable<Scheme>? schemes,
     $core.Iterable<$core.String>? consumes,
     $core.Iterable<$core.String>? produces,
-    $core.Map<$core.String, Response>? responses,
+    $pb.PbMap<$core.String, Response>? responses,
     SecurityDefinitions? securityDefinitions,
     $core.Iterable<SecurityRequirement>? security,
     ExternalDocumentation? externalDocs,
-    $core.Map<$core.String, $11.Value>? extensions,
+    $pb.PbMap<$core.String, $11.Value>? extensions,
   }) {
     final $result = create();
     if (swagger != null) {
@@ -149,18 +151,18 @@ class Swagger extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasSwagger() => $_has(0);
   @$pb.TagNumber(1)
-  void clearSwagger() => clearField(1);
+  void clearSwagger() => $_clearField(1);
 
   /// Provides metadata about the API. The metadata can be used by the
   /// clients if needed.
   @$pb.TagNumber(2)
   Info get info => $_getN(1);
   @$pb.TagNumber(2)
-  set info(Info v) { setField(2, v); }
+  set info(Info v) { $_setField(2, v); }
   @$pb.TagNumber(2)
   $core.bool hasInfo() => $_has(1);
   @$pb.TagNumber(2)
-  void clearInfo() => clearField(2);
+  void clearInfo() => $_clearField(2);
   @$pb.TagNumber(2)
   Info ensureInfo() => $_ensure(1);
 
@@ -175,7 +177,7 @@ class Swagger extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasHost() => $_has(2);
   @$pb.TagNumber(3)
-  void clearHost() => clearField(3);
+  void clearHost() => $_clearField(3);
 
   /// The base path on which the API is served, which is relative to the host. If
   /// it is not included, the API is served directly under the host. The value
@@ -193,40 +195,40 @@ class Swagger extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasBasePath() => $_has(3);
   @$pb.TagNumber(4)
-  void clearBasePath() => clearField(4);
+  void clearBasePath() => $_clearField(4);
 
   /// The transfer protocol of the API. Values MUST be from the list: "http",
   /// "https", "ws", "wss". If the schemes is not included, the default scheme to
   /// be used is the one used to access the OpenAPI definition itself.
   @$pb.TagNumber(5)
-  $core.List<Scheme> get schemes => $_getList(4);
+  $pb.PbList<Scheme> get schemes => $_getList(4);
 
   /// A list of MIME types the APIs can consume. This is global to all APIs but
   /// can be overridden on specific API calls. Value MUST be as described under
   /// Mime Types.
   @$pb.TagNumber(6)
-  $core.List<$core.String> get consumes => $_getList(5);
+  $pb.PbList<$core.String> get consumes => $_getList(5);
 
   /// A list of MIME types the APIs can produce. This is global to all APIs but
   /// can be overridden on specific API calls. Value MUST be as described under
   /// Mime Types.
   @$pb.TagNumber(7)
-  $core.List<$core.String> get produces => $_getList(6);
+  $pb.PbList<$core.String> get produces => $_getList(6);
 
   /// An object to hold responses that can be used across operations. This
   /// property does not define global responses for all operations.
   @$pb.TagNumber(10)
-  $core.Map<$core.String, Response> get responses => $_getMap(7);
+  $pb.PbMap<$core.String, Response> get responses => $_getMap(7);
 
   /// Security scheme definitions that can be used across the specification.
   @$pb.TagNumber(11)
   SecurityDefinitions get securityDefinitions => $_getN(8);
   @$pb.TagNumber(11)
-  set securityDefinitions(SecurityDefinitions v) { setField(11, v); }
+  set securityDefinitions(SecurityDefinitions v) { $_setField(11, v); }
   @$pb.TagNumber(11)
   $core.bool hasSecurityDefinitions() => $_has(8);
   @$pb.TagNumber(11)
-  void clearSecurityDefinitions() => clearField(11);
+  void clearSecurityDefinitions() => $_clearField(11);
   @$pb.TagNumber(11)
   SecurityDefinitions ensureSecurityDefinitions() => $_ensure(8);
 
@@ -235,22 +237,22 @@ class Swagger extends $pb.GeneratedMessage {
   /// (that is, there is a logical OR between the security requirements).
   /// Individual operations can override this definition.
   @$pb.TagNumber(12)
-  $core.List<SecurityRequirement> get security => $_getList(9);
+  $pb.PbList<SecurityRequirement> get security => $_getList(9);
 
   /// Additional external documentation.
   @$pb.TagNumber(14)
   ExternalDocumentation get externalDocs => $_getN(10);
   @$pb.TagNumber(14)
-  set externalDocs(ExternalDocumentation v) { setField(14, v); }
+  set externalDocs(ExternalDocumentation v) { $_setField(14, v); }
   @$pb.TagNumber(14)
   $core.bool hasExternalDocs() => $_has(10);
   @$pb.TagNumber(14)
-  void clearExternalDocs() => clearField(14);
+  void clearExternalDocs() => $_clearField(14);
   @$pb.TagNumber(14)
   ExternalDocumentation ensureExternalDocs() => $_ensure(10);
 
   @$pb.TagNumber(15)
-  $core.Map<$core.String, $11.Value> get extensions => $_getMap(11);
+  $pb.PbMap<$core.String, $11.Value> get extensions => $_getMap(11);
 }
 
 ///  `Operation` is a representation of OpenAPI v2 specification's Operation object.
@@ -287,11 +289,11 @@ class Operation extends $pb.GeneratedMessage {
     $core.String? operationId,
     $core.Iterable<$core.String>? consumes,
     $core.Iterable<$core.String>? produces,
-    $core.Map<$core.String, Response>? responses,
+    $pb.PbMap<$core.String, Response>? responses,
     $core.Iterable<Scheme>? schemes,
     $core.bool? deprecated,
     $core.Iterable<SecurityRequirement>? security,
-    $core.Map<$core.String, $11.Value>? extensions,
+    $pb.PbMap<$core.String, $11.Value>? extensions,
   }) {
     final $result = create();
     if (tags != null) {
@@ -376,7 +378,7 @@ class Operation extends $pb.GeneratedMessage {
   /// A list of tags for API documentation control. Tags can be used for logical
   /// grouping of operations by resources or any other qualifier.
   @$pb.TagNumber(1)
-  $core.List<$core.String> get tags => $_getList(0);
+  $pb.PbList<$core.String> get tags => $_getList(0);
 
   /// A short summary of what the operation does. For maximum readability in the
   /// swagger-ui, this field SHOULD be less than 120 characters.
@@ -387,7 +389,7 @@ class Operation extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasSummary() => $_has(1);
   @$pb.TagNumber(2)
-  void clearSummary() => clearField(2);
+  void clearSummary() => $_clearField(2);
 
   /// A verbose explanation of the operation behavior. GFM syntax can be used for
   /// rich text representation.
@@ -398,17 +400,17 @@ class Operation extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasDescription() => $_has(2);
   @$pb.TagNumber(3)
-  void clearDescription() => clearField(3);
+  void clearDescription() => $_clearField(3);
 
   /// Additional external documentation for this operation.
   @$pb.TagNumber(4)
   ExternalDocumentation get externalDocs => $_getN(3);
   @$pb.TagNumber(4)
-  set externalDocs(ExternalDocumentation v) { setField(4, v); }
+  set externalDocs(ExternalDocumentation v) { $_setField(4, v); }
   @$pb.TagNumber(4)
   $core.bool hasExternalDocs() => $_has(3);
   @$pb.TagNumber(4)
-  void clearExternalDocs() => clearField(4);
+  void clearExternalDocs() => $_clearField(4);
   @$pb.TagNumber(4)
   ExternalDocumentation ensureExternalDocs() => $_ensure(3);
 
@@ -423,30 +425,30 @@ class Operation extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $core.bool hasOperationId() => $_has(4);
   @$pb.TagNumber(5)
-  void clearOperationId() => clearField(5);
+  void clearOperationId() => $_clearField(5);
 
   /// A list of MIME types the operation can consume. This overrides the consumes
   /// definition at the OpenAPI Object. An empty value MAY be used to clear the
   /// global definition. Value MUST be as described under Mime Types.
   @$pb.TagNumber(6)
-  $core.List<$core.String> get consumes => $_getList(5);
+  $pb.PbList<$core.String> get consumes => $_getList(5);
 
   /// A list of MIME types the operation can produce. This overrides the produces
   /// definition at the OpenAPI Object. An empty value MAY be used to clear the
   /// global definition. Value MUST be as described under Mime Types.
   @$pb.TagNumber(7)
-  $core.List<$core.String> get produces => $_getList(6);
+  $pb.PbList<$core.String> get produces => $_getList(6);
 
   /// The list of possible responses as they are returned from executing this
   /// operation.
   @$pb.TagNumber(9)
-  $core.Map<$core.String, Response> get responses => $_getMap(7);
+  $pb.PbMap<$core.String, Response> get responses => $_getMap(7);
 
   /// The transfer protocol for the operation. Values MUST be from the list:
   /// "http", "https", "ws", "wss". The value overrides the OpenAPI Object
   /// schemes definition.
   @$pb.TagNumber(10)
-  $core.List<Scheme> get schemes => $_getList(8);
+  $pb.PbList<Scheme> get schemes => $_getList(8);
 
   /// Declares this operation to be deprecated. Usage of the declared operation
   /// should be refrained. Default value is false.
@@ -457,7 +459,7 @@ class Operation extends $pb.GeneratedMessage {
   @$pb.TagNumber(11)
   $core.bool hasDeprecated() => $_has(9);
   @$pb.TagNumber(11)
-  void clearDeprecated() => clearField(11);
+  void clearDeprecated() => $_clearField(11);
 
   /// A declaration of which security schemes are applied for this operation. The
   /// list of values describes alternative security schemes that can be used
@@ -465,10 +467,10 @@ class Operation extends $pb.GeneratedMessage {
   /// definition overrides any declared top-level security. To remove a top-level
   /// security declaration, an empty array can be used.
   @$pb.TagNumber(12)
-  $core.List<SecurityRequirement> get security => $_getList(10);
+  $pb.PbList<SecurityRequirement> get security => $_getList(10);
 
   @$pb.TagNumber(13)
-  $core.Map<$core.String, $11.Value> get extensions => $_getMap(11);
+  $pb.PbMap<$core.String, $11.Value> get extensions => $_getMap(11);
 }
 
 ///  `Header` is a representation of OpenAPI v2 specification's Header object.
@@ -542,7 +544,7 @@ class Header extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasDescription() => $_has(0);
   @$pb.TagNumber(1)
-  void clearDescription() => clearField(1);
+  void clearDescription() => $_clearField(1);
 
   /// The type of the object. The value MUST be one of "string", "number", "integer", or "boolean". The "array" type is not supported.
   @$pb.TagNumber(2)
@@ -552,7 +554,7 @@ class Header extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasType() => $_has(1);
   @$pb.TagNumber(2)
-  void clearType() => clearField(2);
+  void clearType() => $_clearField(2);
 
   /// `Format` The extending format for the previously mentioned type.
   @$pb.TagNumber(3)
@@ -562,7 +564,7 @@ class Header extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasFormat() => $_has(2);
   @$pb.TagNumber(3)
-  void clearFormat() => clearField(3);
+  void clearFormat() => $_clearField(3);
 
   /// `Default` Declares the value of the header that the server will use if none is provided.
   /// See: https://tools.ietf.org/html/draft-fge-json-schema-validation-00#section-6.2.
@@ -574,7 +576,7 @@ class Header extends $pb.GeneratedMessage {
   @$pb.TagNumber(6)
   $core.bool hasDefault_6() => $_has(3);
   @$pb.TagNumber(6)
-  void clearDefault_6() => clearField(6);
+  void clearDefault_6() => $_clearField(6);
 
   /// 'Pattern' See https://tools.ietf.org/html/draft-fge-json-schema-validation-00#section-5.2.3.
   @$pb.TagNumber(13)
@@ -584,7 +586,7 @@ class Header extends $pb.GeneratedMessage {
   @$pb.TagNumber(13)
   $core.bool hasPattern() => $_has(4);
   @$pb.TagNumber(13)
-  void clearPattern() => clearField(13);
+  void clearPattern() => $_clearField(13);
 }
 
 ///  `Response` is a representation of OpenAPI v2 specification's Response object.
@@ -594,9 +596,9 @@ class Response extends $pb.GeneratedMessage {
   factory Response({
     $core.String? description,
     Schema? schema,
-    $core.Map<$core.String, Header>? headers,
-    $core.Map<$core.String, $core.String>? examples,
-    $core.Map<$core.String, $11.Value>? extensions,
+    $pb.PbMap<$core.String, Header>? headers,
+    $pb.PbMap<$core.String, $core.String>? examples,
+    $pb.PbMap<$core.String, $11.Value>? extensions,
   }) {
     final $result = create();
     if (description != null) {
@@ -659,18 +661,18 @@ class Response extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasDescription() => $_has(0);
   @$pb.TagNumber(1)
-  void clearDescription() => clearField(1);
+  void clearDescription() => $_clearField(1);
 
   /// `Schema` optionally defines the structure of the response.
   /// If `Schema` is not provided, it means there is no content to the response.
   @$pb.TagNumber(2)
   Schema get schema => $_getN(1);
   @$pb.TagNumber(2)
-  set schema(Schema v) { setField(2, v); }
+  set schema(Schema v) { $_setField(2, v); }
   @$pb.TagNumber(2)
   $core.bool hasSchema() => $_has(1);
   @$pb.TagNumber(2)
-  void clearSchema() => clearField(2);
+  void clearSchema() => $_clearField(2);
   @$pb.TagNumber(2)
   Schema ensureSchema() => $_ensure(1);
 
@@ -678,15 +680,15 @@ class Response extends $pb.GeneratedMessage {
   /// `Header` name is expected to be a string in the canonical format of the MIME header key
   /// See: https://golang.org/pkg/net/textproto/#CanonicalMIMEHeaderKey
   @$pb.TagNumber(3)
-  $core.Map<$core.String, Header> get headers => $_getMap(2);
+  $pb.PbMap<$core.String, Header> get headers => $_getMap(2);
 
   /// `Examples` gives per-mimetype response examples.
   /// See: https://github.com/OAI/OpenAPI-Specification/blob/3.0.0/versions/2.0.md#example-object
   @$pb.TagNumber(4)
-  $core.Map<$core.String, $core.String> get examples => $_getMap(3);
+  $pb.PbMap<$core.String, $core.String> get examples => $_getMap(3);
 
   @$pb.TagNumber(5)
-  $core.Map<$core.String, $11.Value> get extensions => $_getMap(4);
+  $pb.PbMap<$core.String, $11.Value> get extensions => $_getMap(4);
 }
 
 ///  `Info` is a representation of OpenAPI v2 specification's Info object.
@@ -720,7 +722,7 @@ class Info extends $pb.GeneratedMessage {
     Contact? contact,
     License? license,
     $core.String? version,
-    $core.Map<$core.String, $11.Value>? extensions,
+    $pb.PbMap<$core.String, $11.Value>? extensions,
   }) {
     final $result = create();
     if (title != null) {
@@ -790,7 +792,7 @@ class Info extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasTitle() => $_has(0);
   @$pb.TagNumber(1)
-  void clearTitle() => clearField(1);
+  void clearTitle() => $_clearField(1);
 
   /// A short description of the application. GFM syntax can be used for rich
   /// text representation.
@@ -801,7 +803,7 @@ class Info extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasDescription() => $_has(1);
   @$pb.TagNumber(2)
-  void clearDescription() => clearField(2);
+  void clearDescription() => $_clearField(2);
 
   /// The Terms of Service for the API.
   @$pb.TagNumber(3)
@@ -811,17 +813,17 @@ class Info extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasTermsOfService() => $_has(2);
   @$pb.TagNumber(3)
-  void clearTermsOfService() => clearField(3);
+  void clearTermsOfService() => $_clearField(3);
 
   /// The contact information for the exposed API.
   @$pb.TagNumber(4)
   Contact get contact => $_getN(3);
   @$pb.TagNumber(4)
-  set contact(Contact v) { setField(4, v); }
+  set contact(Contact v) { $_setField(4, v); }
   @$pb.TagNumber(4)
   $core.bool hasContact() => $_has(3);
   @$pb.TagNumber(4)
-  void clearContact() => clearField(4);
+  void clearContact() => $_clearField(4);
   @$pb.TagNumber(4)
   Contact ensureContact() => $_ensure(3);
 
@@ -829,11 +831,11 @@ class Info extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   License get license => $_getN(4);
   @$pb.TagNumber(5)
-  set license(License v) { setField(5, v); }
+  set license(License v) { $_setField(5, v); }
   @$pb.TagNumber(5)
   $core.bool hasLicense() => $_has(4);
   @$pb.TagNumber(5)
-  void clearLicense() => clearField(5);
+  void clearLicense() => $_clearField(5);
   @$pb.TagNumber(5)
   License ensureLicense() => $_ensure(4);
 
@@ -846,10 +848,10 @@ class Info extends $pb.GeneratedMessage {
   @$pb.TagNumber(6)
   $core.bool hasVersion() => $_has(5);
   @$pb.TagNumber(6)
-  void clearVersion() => clearField(6);
+  void clearVersion() => $_clearField(6);
 
   @$pb.TagNumber(7)
-  $core.Map<$core.String, $11.Value> get extensions => $_getMap(6);
+  $pb.PbMap<$core.String, $11.Value> get extensions => $_getMap(6);
 }
 
 ///  `Contact` is a representation of OpenAPI v2 specification's Contact object.
@@ -928,7 +930,7 @@ class Contact extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasName() => $_has(0);
   @$pb.TagNumber(1)
-  void clearName() => clearField(1);
+  void clearName() => $_clearField(1);
 
   /// The URL pointing to the contact information. MUST be in the format of a
   /// URL.
@@ -939,7 +941,7 @@ class Contact extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasUrl() => $_has(1);
   @$pb.TagNumber(2)
-  void clearUrl() => clearField(2);
+  void clearUrl() => $_clearField(2);
 
   /// The email address of the contact person/organization. MUST be in the format
   /// of an email address.
@@ -950,7 +952,7 @@ class Contact extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasEmail() => $_has(2);
   @$pb.TagNumber(3)
-  void clearEmail() => clearField(3);
+  void clearEmail() => $_clearField(3);
 }
 
 ///  `License` is a representation of OpenAPI v2 specification's License object.
@@ -1023,7 +1025,7 @@ class License extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasName() => $_has(0);
   @$pb.TagNumber(1)
-  void clearName() => clearField(1);
+  void clearName() => $_clearField(1);
 
   /// A URL to the license used for the API. MUST be in the format of a URL.
   @$pb.TagNumber(2)
@@ -1033,7 +1035,7 @@ class License extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasUrl() => $_has(1);
   @$pb.TagNumber(2)
-  void clearUrl() => clearField(2);
+  void clearUrl() => $_clearField(2);
 }
 
 ///  `ExternalDocumentation` is a representation of OpenAPI v2 specification's
@@ -1105,7 +1107,7 @@ class ExternalDocumentation extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasDescription() => $_has(0);
   @$pb.TagNumber(1)
-  void clearDescription() => clearField(1);
+  void clearDescription() => $_clearField(1);
 
   /// The URL for the target documentation. Value MUST be in the format
   /// of a URL.
@@ -1116,7 +1118,7 @@ class ExternalDocumentation extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasUrl() => $_has(1);
   @$pb.TagNumber(2)
-  void clearUrl() => clearField(2);
+  void clearUrl() => $_clearField(2);
 }
 
 ///  `Schema` is a representation of OpenAPI v2 specification's Schema object.
@@ -1185,11 +1187,11 @@ class Schema extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   JSONSchema get jsonSchema => $_getN(0);
   @$pb.TagNumber(1)
-  set jsonSchema(JSONSchema v) { setField(1, v); }
+  set jsonSchema(JSONSchema v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasJsonSchema() => $_has(0);
   @$pb.TagNumber(1)
-  void clearJsonSchema() => clearField(1);
+  void clearJsonSchema() => $_clearField(1);
   @$pb.TagNumber(1)
   JSONSchema ensureJsonSchema() => $_ensure(0);
 
@@ -1205,7 +1207,7 @@ class Schema extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasDiscriminator() => $_has(1);
   @$pb.TagNumber(2)
-  void clearDiscriminator() => clearField(2);
+  void clearDiscriminator() => $_clearField(2);
 
   /// Relevant only for Schema "properties" definitions. Declares the property as
   /// "read only". This means that it MAY be sent as part of a response but MUST
@@ -1219,17 +1221,17 @@ class Schema extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasReadOnly() => $_has(2);
   @$pb.TagNumber(3)
-  void clearReadOnly() => clearField(3);
+  void clearReadOnly() => $_clearField(3);
 
   /// Additional external documentation for this schema.
   @$pb.TagNumber(5)
   ExternalDocumentation get externalDocs => $_getN(3);
   @$pb.TagNumber(5)
-  set externalDocs(ExternalDocumentation v) { setField(5, v); }
+  set externalDocs(ExternalDocumentation v) { $_setField(5, v); }
   @$pb.TagNumber(5)
   $core.bool hasExternalDocs() => $_has(3);
   @$pb.TagNumber(5)
-  void clearExternalDocs() => clearField(5);
+  void clearExternalDocs() => $_clearField(5);
   @$pb.TagNumber(5)
   ExternalDocumentation ensureExternalDocs() => $_ensure(3);
 
@@ -1242,7 +1244,7 @@ class Schema extends $pb.GeneratedMessage {
   @$pb.TagNumber(6)
   $core.bool hasExample() => $_has(4);
   @$pb.TagNumber(6)
-  void clearExample() => clearField(6);
+  void clearExample() => $_clearField(6);
 }
 
 ///  `JSONSchema` represents properties from JSON Schema taken, and as used, in
@@ -1441,7 +1443,7 @@ class JSONSchema extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasRef() => $_has(0);
   @$pb.TagNumber(3)
-  void clearRef() => clearField(3);
+  void clearRef() => $_clearField(3);
 
   /// The title of the schema.
   @$pb.TagNumber(5)
@@ -1451,7 +1453,7 @@ class JSONSchema extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $core.bool hasTitle() => $_has(1);
   @$pb.TagNumber(5)
-  void clearTitle() => clearField(5);
+  void clearTitle() => $_clearField(5);
 
   /// A short description of the schema.
   @$pb.TagNumber(6)
@@ -1461,7 +1463,7 @@ class JSONSchema extends $pb.GeneratedMessage {
   @$pb.TagNumber(6)
   $core.bool hasDescription() => $_has(2);
   @$pb.TagNumber(6)
-  void clearDescription() => clearField(6);
+  void clearDescription() => $_clearField(6);
 
   @$pb.TagNumber(7)
   $core.String get default_7 => $_getSZ(3);
@@ -1470,7 +1472,7 @@ class JSONSchema extends $pb.GeneratedMessage {
   @$pb.TagNumber(7)
   $core.bool hasDefault_7() => $_has(3);
   @$pb.TagNumber(7)
-  void clearDefault_7() => clearField(7);
+  void clearDefault_7() => $_clearField(7);
 
   @$pb.TagNumber(8)
   $core.bool get readOnly => $_getBF(4);
@@ -1479,7 +1481,7 @@ class JSONSchema extends $pb.GeneratedMessage {
   @$pb.TagNumber(8)
   $core.bool hasReadOnly() => $_has(4);
   @$pb.TagNumber(8)
-  void clearReadOnly() => clearField(8);
+  void clearReadOnly() => $_clearField(8);
 
   /// A free-form property to include a JSON example of this field. This is copied
   /// verbatim to the output swagger.json. Quotes must be escaped.
@@ -1491,7 +1493,7 @@ class JSONSchema extends $pb.GeneratedMessage {
   @$pb.TagNumber(9)
   $core.bool hasExample() => $_has(5);
   @$pb.TagNumber(9)
-  void clearExample() => clearField(9);
+  void clearExample() => $_clearField(9);
 
   @$pb.TagNumber(10)
   $core.double get multipleOf => $_getN(6);
@@ -1500,7 +1502,7 @@ class JSONSchema extends $pb.GeneratedMessage {
   @$pb.TagNumber(10)
   $core.bool hasMultipleOf() => $_has(6);
   @$pb.TagNumber(10)
-  void clearMultipleOf() => clearField(10);
+  void clearMultipleOf() => $_clearField(10);
 
   /// Maximum represents an inclusive upper limit for a numeric instance. The
   /// value of MUST be a number,
@@ -1511,7 +1513,7 @@ class JSONSchema extends $pb.GeneratedMessage {
   @$pb.TagNumber(11)
   $core.bool hasMaximum() => $_has(7);
   @$pb.TagNumber(11)
-  void clearMaximum() => clearField(11);
+  void clearMaximum() => $_clearField(11);
 
   @$pb.TagNumber(12)
   $core.bool get exclusiveMaximum => $_getBF(8);
@@ -1520,7 +1522,7 @@ class JSONSchema extends $pb.GeneratedMessage {
   @$pb.TagNumber(12)
   $core.bool hasExclusiveMaximum() => $_has(8);
   @$pb.TagNumber(12)
-  void clearExclusiveMaximum() => clearField(12);
+  void clearExclusiveMaximum() => $_clearField(12);
 
   /// minimum represents an inclusive lower limit for a numeric instance. The
   /// value of MUST be a number,
@@ -1531,7 +1533,7 @@ class JSONSchema extends $pb.GeneratedMessage {
   @$pb.TagNumber(13)
   $core.bool hasMinimum() => $_has(9);
   @$pb.TagNumber(13)
-  void clearMinimum() => clearField(13);
+  void clearMinimum() => $_clearField(13);
 
   @$pb.TagNumber(14)
   $core.bool get exclusiveMinimum => $_getBF(10);
@@ -1540,7 +1542,7 @@ class JSONSchema extends $pb.GeneratedMessage {
   @$pb.TagNumber(14)
   $core.bool hasExclusiveMinimum() => $_has(10);
   @$pb.TagNumber(14)
-  void clearExclusiveMinimum() => clearField(14);
+  void clearExclusiveMinimum() => $_clearField(14);
 
   @$pb.TagNumber(15)
   $fixnum.Int64 get maxLength => $_getI64(11);
@@ -1549,7 +1551,7 @@ class JSONSchema extends $pb.GeneratedMessage {
   @$pb.TagNumber(15)
   $core.bool hasMaxLength() => $_has(11);
   @$pb.TagNumber(15)
-  void clearMaxLength() => clearField(15);
+  void clearMaxLength() => $_clearField(15);
 
   @$pb.TagNumber(16)
   $fixnum.Int64 get minLength => $_getI64(12);
@@ -1558,7 +1560,7 @@ class JSONSchema extends $pb.GeneratedMessage {
   @$pb.TagNumber(16)
   $core.bool hasMinLength() => $_has(12);
   @$pb.TagNumber(16)
-  void clearMinLength() => clearField(16);
+  void clearMinLength() => $_clearField(16);
 
   @$pb.TagNumber(17)
   $core.String get pattern => $_getSZ(13);
@@ -1567,7 +1569,7 @@ class JSONSchema extends $pb.GeneratedMessage {
   @$pb.TagNumber(17)
   $core.bool hasPattern() => $_has(13);
   @$pb.TagNumber(17)
-  void clearPattern() => clearField(17);
+  void clearPattern() => $_clearField(17);
 
   @$pb.TagNumber(20)
   $fixnum.Int64 get maxItems => $_getI64(14);
@@ -1576,7 +1578,7 @@ class JSONSchema extends $pb.GeneratedMessage {
   @$pb.TagNumber(20)
   $core.bool hasMaxItems() => $_has(14);
   @$pb.TagNumber(20)
-  void clearMaxItems() => clearField(20);
+  void clearMaxItems() => $_clearField(20);
 
   @$pb.TagNumber(21)
   $fixnum.Int64 get minItems => $_getI64(15);
@@ -1585,7 +1587,7 @@ class JSONSchema extends $pb.GeneratedMessage {
   @$pb.TagNumber(21)
   $core.bool hasMinItems() => $_has(15);
   @$pb.TagNumber(21)
-  void clearMinItems() => clearField(21);
+  void clearMinItems() => $_clearField(21);
 
   @$pb.TagNumber(22)
   $core.bool get uniqueItems => $_getBF(16);
@@ -1594,7 +1596,7 @@ class JSONSchema extends $pb.GeneratedMessage {
   @$pb.TagNumber(22)
   $core.bool hasUniqueItems() => $_has(16);
   @$pb.TagNumber(22)
-  void clearUniqueItems() => clearField(22);
+  void clearUniqueItems() => $_clearField(22);
 
   @$pb.TagNumber(24)
   $fixnum.Int64 get maxProperties => $_getI64(17);
@@ -1603,7 +1605,7 @@ class JSONSchema extends $pb.GeneratedMessage {
   @$pb.TagNumber(24)
   $core.bool hasMaxProperties() => $_has(17);
   @$pb.TagNumber(24)
-  void clearMaxProperties() => clearField(24);
+  void clearMaxProperties() => $_clearField(24);
 
   @$pb.TagNumber(25)
   $fixnum.Int64 get minProperties => $_getI64(18);
@@ -1612,17 +1614,17 @@ class JSONSchema extends $pb.GeneratedMessage {
   @$pb.TagNumber(25)
   $core.bool hasMinProperties() => $_has(18);
   @$pb.TagNumber(25)
-  void clearMinProperties() => clearField(25);
+  void clearMinProperties() => $_clearField(25);
 
   @$pb.TagNumber(26)
-  $core.List<$core.String> get required => $_getList(19);
+  $pb.PbList<$core.String> get required => $_getList(19);
 
   /// Items in 'array' must be unique.
   @$pb.TagNumber(34)
-  $core.List<$core.String> get array => $_getList(20);
+  $pb.PbList<$core.String> get array => $_getList(20);
 
   @$pb.TagNumber(35)
-  $core.List<JSONSchema_JSONSchemaSimpleTypes> get type => $_getList(21);
+  $pb.PbList<JSONSchema_JSONSchemaSimpleTypes> get type => $_getList(21);
 
   /// `Format`
   @$pb.TagNumber(36)
@@ -1632,11 +1634,11 @@ class JSONSchema extends $pb.GeneratedMessage {
   @$pb.TagNumber(36)
   $core.bool hasFormat() => $_has(22);
   @$pb.TagNumber(36)
-  void clearFormat() => clearField(36);
+  void clearFormat() => $_clearField(36);
 
   /// Items in `enum` must be unique https://tools.ietf.org/html/draft-fge-json-schema-validation-00#section-5.5.1
   @$pb.TagNumber(46)
-  $core.List<$core.String> get enum_46 => $_getList(23);
+  $pb.PbList<$core.String> get enum_46 => $_getList(23);
 }
 
 ///  `Tag` is a representation of OpenAPI v2 specification's Tag object.
@@ -1696,17 +1698,17 @@ class Tag extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasDescription() => $_has(0);
   @$pb.TagNumber(2)
-  void clearDescription() => clearField(2);
+  void clearDescription() => $_clearField(2);
 
   /// Additional external documentation for this tag.
   @$pb.TagNumber(3)
   ExternalDocumentation get externalDocs => $_getN(1);
   @$pb.TagNumber(3)
-  set externalDocs(ExternalDocumentation v) { setField(3, v); }
+  set externalDocs(ExternalDocumentation v) { $_setField(3, v); }
   @$pb.TagNumber(3)
   $core.bool hasExternalDocs() => $_has(1);
   @$pb.TagNumber(3)
-  void clearExternalDocs() => clearField(3);
+  void clearExternalDocs() => $_clearField(3);
   @$pb.TagNumber(3)
   ExternalDocumentation ensureExternalDocs() => $_ensure(1);
 }
@@ -1721,7 +1723,7 @@ class Tag extends $pb.GeneratedMessage {
 ///  and only serves to provide the relevant details for each scheme.
 class SecurityDefinitions extends $pb.GeneratedMessage {
   factory SecurityDefinitions({
-    $core.Map<$core.String, SecurityScheme>? security,
+    $pb.PbMap<$core.String, SecurityScheme>? security,
   }) {
     final $result = create();
     if (security != null) {
@@ -1762,7 +1764,7 @@ class SecurityDefinitions extends $pb.GeneratedMessage {
   /// A single security scheme definition, mapping a "name" to the scheme it
   /// defines.
   @$pb.TagNumber(1)
-  $core.Map<$core.String, SecurityScheme> get security => $_getMap(0);
+  $pb.PbMap<$core.String, SecurityScheme> get security => $_getMap(0);
 }
 
 ///  `SecurityScheme` is a representation of OpenAPI v2 specification's
@@ -1784,7 +1786,7 @@ class SecurityScheme extends $pb.GeneratedMessage {
     $core.String? authorizationUrl,
     $core.String? tokenUrl,
     Scopes? scopes,
-    $core.Map<$core.String, $11.Value>? extensions,
+    $pb.PbMap<$core.String, $11.Value>? extensions,
   }) {
     final $result = create();
     if (type != null) {
@@ -1859,11 +1861,11 @@ class SecurityScheme extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   SecurityScheme_Type get type => $_getN(0);
   @$pb.TagNumber(1)
-  set type(SecurityScheme_Type v) { setField(1, v); }
+  set type(SecurityScheme_Type v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasType() => $_has(0);
   @$pb.TagNumber(1)
-  void clearType() => clearField(1);
+  void clearType() => $_clearField(1);
 
   /// A short description for security scheme.
   @$pb.TagNumber(2)
@@ -1873,7 +1875,7 @@ class SecurityScheme extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasDescription() => $_has(1);
   @$pb.TagNumber(2)
-  void clearDescription() => clearField(2);
+  void clearDescription() => $_clearField(2);
 
   /// The name of the header or query parameter to be used.
   /// Valid for apiKey.
@@ -1884,7 +1886,7 @@ class SecurityScheme extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasName() => $_has(2);
   @$pb.TagNumber(3)
-  void clearName() => clearField(3);
+  void clearName() => $_clearField(3);
 
   /// The location of the API key. Valid values are "query" or
   /// "header".
@@ -1892,11 +1894,11 @@ class SecurityScheme extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   SecurityScheme_In get in_4 => $_getN(3);
   @$pb.TagNumber(4)
-  set in_4(SecurityScheme_In v) { setField(4, v); }
+  set in_4(SecurityScheme_In v) { $_setField(4, v); }
   @$pb.TagNumber(4)
   $core.bool hasIn_4() => $_has(3);
   @$pb.TagNumber(4)
-  void clearIn_4() => clearField(4);
+  void clearIn_4() => $_clearField(4);
 
   /// The flow used by the OAuth2 security scheme. Valid values are
   /// "implicit", "password", "application" or "accessCode".
@@ -1904,11 +1906,11 @@ class SecurityScheme extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   SecurityScheme_Flow get flow => $_getN(4);
   @$pb.TagNumber(5)
-  set flow(SecurityScheme_Flow v) { setField(5, v); }
+  set flow(SecurityScheme_Flow v) { $_setField(5, v); }
   @$pb.TagNumber(5)
   $core.bool hasFlow() => $_has(4);
   @$pb.TagNumber(5)
-  void clearFlow() => clearField(5);
+  void clearFlow() => $_clearField(5);
 
   /// The authorization URL to be used for this flow. This SHOULD be in
   /// the form of a URL.
@@ -1920,7 +1922,7 @@ class SecurityScheme extends $pb.GeneratedMessage {
   @$pb.TagNumber(6)
   $core.bool hasAuthorizationUrl() => $_has(5);
   @$pb.TagNumber(6)
-  void clearAuthorizationUrl() => clearField(6);
+  void clearAuthorizationUrl() => $_clearField(6);
 
   /// The token URL to be used for this flow. This SHOULD be in the
   /// form of a URL.
@@ -1932,23 +1934,23 @@ class SecurityScheme extends $pb.GeneratedMessage {
   @$pb.TagNumber(7)
   $core.bool hasTokenUrl() => $_has(6);
   @$pb.TagNumber(7)
-  void clearTokenUrl() => clearField(7);
+  void clearTokenUrl() => $_clearField(7);
 
   /// The available scopes for the OAuth2 security scheme.
   /// Valid for oauth2.
   @$pb.TagNumber(8)
   Scopes get scopes => $_getN(7);
   @$pb.TagNumber(8)
-  set scopes(Scopes v) { setField(8, v); }
+  set scopes(Scopes v) { $_setField(8, v); }
   @$pb.TagNumber(8)
   $core.bool hasScopes() => $_has(7);
   @$pb.TagNumber(8)
-  void clearScopes() => clearField(8);
+  void clearScopes() => $_clearField(8);
   @$pb.TagNumber(8)
   Scopes ensureScopes() => $_ensure(7);
 
   @$pb.TagNumber(9)
-  $core.Map<$core.String, $11.Value> get extensions => $_getMap(8);
+  $pb.PbMap<$core.String, $11.Value> get extensions => $_getMap(8);
 }
 
 /// If the security scheme is of type "oauth2", then the value is a list of
@@ -1995,7 +1997,7 @@ class SecurityRequirement_SecurityRequirementValue extends $pb.GeneratedMessage
   static SecurityRequirement_SecurityRequirementValue? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $core.List<$core.String> get scope => $_getList(0);
+  $pb.PbList<$core.String> get scope => $_getList(0);
 }
 
 ///  `SecurityRequirement` is a representation of OpenAPI v2 specification's
@@ -2011,7 +2013,7 @@ class SecurityRequirement_SecurityRequirementValue extends $pb.GeneratedMessage
 ///  declared in the Security Definitions.
 class SecurityRequirement extends $pb.GeneratedMessage {
   factory SecurityRequirement({
-    $core.Map<$core.String, SecurityRequirement_SecurityRequirementValue>? securityRequirement,
+    $pb.PbMap<$core.String, SecurityRequirement_SecurityRequirementValue>? securityRequirement,
   }) {
     final $result = create();
     if (securityRequirement != null) {
@@ -2054,7 +2056,7 @@ class SecurityRequirement extends $pb.GeneratedMessage {
   /// then the value is a list of scope names required for the execution.
   /// For other security scheme types, the array MUST be empty.
   @$pb.TagNumber(1)
-  $core.Map<$core.String, SecurityRequirement_SecurityRequirementValue> get securityRequirement => $_getMap(0);
+  $pb.PbMap<$core.String, SecurityRequirement_SecurityRequirementValue> get securityRequirement => $_getMap(0);
 }
 
 ///  `Scopes` is a representation of OpenAPI v2 specification's Scopes object.
@@ -2064,7 +2066,7 @@ class SecurityRequirement extends $pb.GeneratedMessage {
 ///  Lists the available scopes for an OAuth2 security scheme.
 class Scopes extends $pb.GeneratedMessage {
   factory Scopes({
-    $core.Map<$core.String, $core.String>? scope,
+    $pb.PbMap<$core.String, $core.String>? scope,
   }) {
     final $result = create();
     if (scope != null) {
@@ -2105,7 +2107,7 @@ class Scopes extends $pb.GeneratedMessage {
   /// Maps between a name of a scope to a short description of it (as the value
   /// of the property).
   @$pb.TagNumber(1)
-  $core.Map<$core.String, $core.String> get scope => $_getMap(0);
+  $pb.PbMap<$core.String, $core.String> get scope => $_getMap(0);
 }
 
 
diff --git a/lib/openapiv2.pbenum.dart b/lib/openapiv2.pbenum.dart
index 2484462..59d2eca 100644
--- a/lib/openapiv2.pbenum.dart
+++ b/lib/openapiv2.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: openapiv2.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -33,7 +33,7 @@ class Scheme extends $pb.ProtobufEnum {
   static final $core.Map<$core.int, Scheme> _byValue = $pb.ProtobufEnum.initByValue(values);
   static Scheme? valueOf($core.int value) => _byValue[value];
 
-  const Scheme._($core.int v, $core.String n) : super(v, n);
+  const Scheme._(super.v, super.n);
 }
 
 class JSONSchema_JSONSchemaSimpleTypes extends $pb.ProtobufEnum {
@@ -60,7 +60,7 @@ class JSONSchema_JSONSchemaSimpleTypes extends $pb.ProtobufEnum {
   static final $core.Map<$core.int, JSONSchema_JSONSchemaSimpleTypes> _byValue = $pb.ProtobufEnum.initByValue(values);
   static JSONSchema_JSONSchemaSimpleTypes? valueOf($core.int value) => _byValue[value];
 
-  const JSONSchema_JSONSchemaSimpleTypes._($core.int v, $core.String n) : super(v, n);
+  const JSONSchema_JSONSchemaSimpleTypes._(super.v, super.n);
 }
 
 /// The type of the security scheme. Valid values are "basic",
@@ -81,7 +81,7 @@ class SecurityScheme_Type extends $pb.ProtobufEnum {
   static final $core.Map<$core.int, SecurityScheme_Type> _byValue = $pb.ProtobufEnum.initByValue(values);
   static SecurityScheme_Type? valueOf($core.int value) => _byValue[value];
 
-  const SecurityScheme_Type._($core.int v, $core.String n) : super(v, n);
+  const SecurityScheme_Type._(super.v, super.n);
 }
 
 /// The location of the API key. Valid values are "query" or "header".
@@ -99,7 +99,7 @@ class SecurityScheme_In extends $pb.ProtobufEnum {
   static final $core.Map<$core.int, SecurityScheme_In> _byValue = $pb.ProtobufEnum.initByValue(values);
   static SecurityScheme_In? valueOf($core.int value) => _byValue[value];
 
-  const SecurityScheme_In._($core.int v, $core.String n) : super(v, n);
+  const SecurityScheme_In._(super.v, super.n);
 }
 
 /// The flow used by the OAuth2 security scheme. Valid values are
@@ -122,7 +122,7 @@ class SecurityScheme_Flow extends $pb.ProtobufEnum {
   static final $core.Map<$core.int, SecurityScheme_Flow> _byValue = $pb.ProtobufEnum.initByValue(values);
   static SecurityScheme_Flow? valueOf($core.int value) => _byValue[value];
 
-  const SecurityScheme_Flow._($core.int v, $core.String n) : super(v, n);
+  const SecurityScheme_Flow._(super.v, super.n);
 }
 
 
diff --git a/lib/openapiv2.pbjson.dart b/lib/openapiv2.pbjson.dart
index ddc4f2f..284217c 100644
--- a/lib/openapiv2.pbjson.dart
+++ b/lib/openapiv2.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: openapiv2.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/validate.pb.dart b/lib/validate.pb.dart
index c0551d4..118dc7c 100644
--- a/lib/validate.pb.dart
+++ b/lib/validate.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: validate.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -18,6 +18,8 @@ import 'google/protobuf/duration.pb.dart' as $13;
 import 'google/protobuf/timestamp.pb.dart' as $14;
 import 'validate.pbenum.dart';
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 export 'validate.pbenum.dart';
 
 enum FieldRules_Type {
@@ -218,171 +220,171 @@ class FieldRules extends $pb.GeneratedMessage {
   static FieldRules? _defaultInstance;
 
   FieldRules_Type whichType() => _FieldRules_TypeByTag[$_whichOneof(0)]!;
-  void clearType() => clearField($_whichOneof(0));
+  void clearType() => $_clearField($_whichOneof(0));
 
   /// Scalar Field Types
   @$pb.TagNumber(1)
   FloatRules get float => $_getN(0);
   @$pb.TagNumber(1)
-  set float(FloatRules v) { setField(1, v); }
+  set float(FloatRules v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasFloat() => $_has(0);
   @$pb.TagNumber(1)
-  void clearFloat() => clearField(1);
+  void clearFloat() => $_clearField(1);
   @$pb.TagNumber(1)
   FloatRules ensureFloat() => $_ensure(0);
 
   @$pb.TagNumber(2)
   DoubleRules get double_2 => $_getN(1);
   @$pb.TagNumber(2)
-  set double_2(DoubleRules v) { setField(2, v); }
+  set double_2(DoubleRules v) { $_setField(2, v); }
   @$pb.TagNumber(2)
   $core.bool hasDouble_2() => $_has(1);
   @$pb.TagNumber(2)
-  void clearDouble_2() => clearField(2);
+  void clearDouble_2() => $_clearField(2);
   @$pb.TagNumber(2)
   DoubleRules ensureDouble_2() => $_ensure(1);
 
   @$pb.TagNumber(3)
   Int32Rules get int32 => $_getN(2);
   @$pb.TagNumber(3)
-  set int32(Int32Rules v) { setField(3, v); }
+  set int32(Int32Rules v) { $_setField(3, v); }
   @$pb.TagNumber(3)
   $core.bool hasInt32() => $_has(2);
   @$pb.TagNumber(3)
-  void clearInt32() => clearField(3);
+  void clearInt32() => $_clearField(3);
   @$pb.TagNumber(3)
   Int32Rules ensureInt32() => $_ensure(2);
 
   @$pb.TagNumber(4)
   Int64Rules get int64 => $_getN(3);
   @$pb.TagNumber(4)
-  set int64(Int64Rules v) { setField(4, v); }
+  set int64(Int64Rules v) { $_setField(4, v); }
   @$pb.TagNumber(4)
   $core.bool hasInt64() => $_has(3);
   @$pb.TagNumber(4)
-  void clearInt64() => clearField(4);
+  void clearInt64() => $_clearField(4);
   @$pb.TagNumber(4)
   Int64Rules ensureInt64() => $_ensure(3);
 
   @$pb.TagNumber(5)
   UInt32Rules get uint32 => $_getN(4);
   @$pb.TagNumber(5)
-  set uint32(UInt32Rules v) { setField(5, v); }
+  set uint32(UInt32Rules v) { $_setField(5, v); }
   @$pb.TagNumber(5)
   $core.bool hasUint32() => $_has(4);
   @$pb.TagNumber(5)
-  void clearUint32() => clearField(5);
+  void clearUint32() => $_clearField(5);
   @$pb.TagNumber(5)
   UInt32Rules ensureUint32() => $_ensure(4);
 
   @$pb.TagNumber(6)
   UInt64Rules get uint64 => $_getN(5);
   @$pb.TagNumber(6)
-  set uint64(UInt64Rules v) { setField(6, v); }
+  set uint64(UInt64Rules v) { $_setField(6, v); }
   @$pb.TagNumber(6)
   $core.bool hasUint64() => $_has(5);
   @$pb.TagNumber(6)
-  void clearUint64() => clearField(6);
+  void clearUint64() => $_clearField(6);
   @$pb.TagNumber(6)
   UInt64Rules ensureUint64() => $_ensure(5);
 
   @$pb.TagNumber(7)
   SInt32Rules get sint32 => $_getN(6);
   @$pb.TagNumber(7)
-  set sint32(SInt32Rules v) { setField(7, v); }
+  set sint32(SInt32Rules v) { $_setField(7, v); }
   @$pb.TagNumber(7)
   $core.bool hasSint32() => $_has(6);
   @$pb.TagNumber(7)
-  void clearSint32() => clearField(7);
+  void clearSint32() => $_clearField(7);
   @$pb.TagNumber(7)
   SInt32Rules ensureSint32() => $_ensure(6);
 
   @$pb.TagNumber(8)
   SInt64Rules get sint64 => $_getN(7);
   @$pb.TagNumber(8)
-  set sint64(SInt64Rules v) { setField(8, v); }
+  set sint64(SInt64Rules v) { $_setField(8, v); }
   @$pb.TagNumber(8)
   $core.bool hasSint64() => $_has(7);
   @$pb.TagNumber(8)
-  void clearSint64() => clearField(8);
+  void clearSint64() => $_clearField(8);
   @$pb.TagNumber(8)
   SInt64Rules ensureSint64() => $_ensure(7);
 
   @$pb.TagNumber(9)
   Fixed32Rules get fixed32 => $_getN(8);
   @$pb.TagNumber(9)
-  set fixed32(Fixed32Rules v) { setField(9, v); }
+  set fixed32(Fixed32Rules v) { $_setField(9, v); }
   @$pb.TagNumber(9)
   $core.bool hasFixed32() => $_has(8);
   @$pb.TagNumber(9)
-  void clearFixed32() => clearField(9);
+  void clearFixed32() => $_clearField(9);
   @$pb.TagNumber(9)
   Fixed32Rules ensureFixed32() => $_ensure(8);
 
   @$pb.TagNumber(10)
   Fixed64Rules get fixed64 => $_getN(9);
   @$pb.TagNumber(10)
-  set fixed64(Fixed64Rules v) { setField(10, v); }
+  set fixed64(Fixed64Rules v) { $_setField(10, v); }
   @$pb.TagNumber(10)
   $core.bool hasFixed64() => $_has(9);
   @$pb.TagNumber(10)
-  void clearFixed64() => clearField(10);
+  void clearFixed64() => $_clearField(10);
   @$pb.TagNumber(10)
   Fixed64Rules ensureFixed64() => $_ensure(9);
 
   @$pb.TagNumber(11)
   SFixed32Rules get sfixed32 => $_getN(10);
   @$pb.TagNumber(11)
-  set sfixed32(SFixed32Rules v) { setField(11, v); }
+  set sfixed32(SFixed32Rules v) { $_setField(11, v); }
   @$pb.TagNumber(11)
   $core.bool hasSfixed32() => $_has(10);
   @$pb.TagNumber(11)
-  void clearSfixed32() => clearField(11);
+  void clearSfixed32() => $_clearField(11);
   @$pb.TagNumber(11)
   SFixed32Rules ensureSfixed32() => $_ensure(10);
 
   @$pb.TagNumber(12)
   SFixed64Rules get sfixed64 => $_getN(11);
   @$pb.TagNumber(12)
-  set sfixed64(SFixed64Rules v) { setField(12, v); }
+  set sfixed64(SFixed64Rules v) { $_setField(12, v); }
   @$pb.TagNumber(12)
   $core.bool hasSfixed64() => $_has(11);
   @$pb.TagNumber(12)
-  void clearSfixed64() => clearField(12);
+  void clearSfixed64() => $_clearField(12);
   @$pb.TagNumber(12)
   SFixed64Rules ensureSfixed64() => $_ensure(11);
 
   @$pb.TagNumber(13)
   BoolRules get bool_13 => $_getN(12);
   @$pb.TagNumber(13)
-  set bool_13(BoolRules v) { setField(13, v); }
+  set bool_13(BoolRules v) { $_setField(13, v); }
   @$pb.TagNumber(13)
   $core.bool hasBool_13() => $_has(12);
   @$pb.TagNumber(13)
-  void clearBool_13() => clearField(13);
+  void clearBool_13() => $_clearField(13);
   @$pb.TagNumber(13)
   BoolRules ensureBool_13() => $_ensure(12);
 
   @$pb.TagNumber(14)
   StringRules get string => $_getN(13);
   @$pb.TagNumber(14)
-  set string(StringRules v) { setField(14, v); }
+  set string(StringRules v) { $_setField(14, v); }
   @$pb.TagNumber(14)
   $core.bool hasString() => $_has(13);
   @$pb.TagNumber(14)
-  void clearString() => clearField(14);
+  void clearString() => $_clearField(14);
   @$pb.TagNumber(14)
   StringRules ensureString() => $_ensure(13);
 
   @$pb.TagNumber(15)
   BytesRules get bytes => $_getN(14);
   @$pb.TagNumber(15)
-  set bytes(BytesRules v) { setField(15, v); }
+  set bytes(BytesRules v) { $_setField(15, v); }
   @$pb.TagNumber(15)
   $core.bool hasBytes() => $_has(14);
   @$pb.TagNumber(15)
-  void clearBytes() => clearField(15);
+  void clearBytes() => $_clearField(15);
   @$pb.TagNumber(15)
   BytesRules ensureBytes() => $_ensure(14);
 
@@ -390,44 +392,44 @@ class FieldRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(16)
   EnumRules get enum_16 => $_getN(15);
   @$pb.TagNumber(16)
-  set enum_16(EnumRules v) { setField(16, v); }
+  set enum_16(EnumRules v) { $_setField(16, v); }
   @$pb.TagNumber(16)
   $core.bool hasEnum_16() => $_has(15);
   @$pb.TagNumber(16)
-  void clearEnum_16() => clearField(16);
+  void clearEnum_16() => $_clearField(16);
   @$pb.TagNumber(16)
   EnumRules ensureEnum_16() => $_ensure(15);
 
   @$pb.TagNumber(17)
   MessageRules get message => $_getN(16);
   @$pb.TagNumber(17)
-  set message(MessageRules v) { setField(17, v); }
+  set message(MessageRules v) { $_setField(17, v); }
   @$pb.TagNumber(17)
   $core.bool hasMessage() => $_has(16);
   @$pb.TagNumber(17)
-  void clearMessage() => clearField(17);
+  void clearMessage() => $_clearField(17);
   @$pb.TagNumber(17)
   MessageRules ensureMessage() => $_ensure(16);
 
   @$pb.TagNumber(18)
   RepeatedRules get repeated => $_getN(17);
   @$pb.TagNumber(18)
-  set repeated(RepeatedRules v) { setField(18, v); }
+  set repeated(RepeatedRules v) { $_setField(18, v); }
   @$pb.TagNumber(18)
   $core.bool hasRepeated() => $_has(17);
   @$pb.TagNumber(18)
-  void clearRepeated() => clearField(18);
+  void clearRepeated() => $_clearField(18);
   @$pb.TagNumber(18)
   RepeatedRules ensureRepeated() => $_ensure(17);
 
   @$pb.TagNumber(19)
   MapRules get map => $_getN(18);
   @$pb.TagNumber(19)
-  set map(MapRules v) { setField(19, v); }
+  set map(MapRules v) { $_setField(19, v); }
   @$pb.TagNumber(19)
   $core.bool hasMap() => $_has(18);
   @$pb.TagNumber(19)
-  void clearMap() => clearField(19);
+  void clearMap() => $_clearField(19);
   @$pb.TagNumber(19)
   MapRules ensureMap() => $_ensure(18);
 
@@ -435,33 +437,33 @@ class FieldRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(20)
   AnyRules get any => $_getN(19);
   @$pb.TagNumber(20)
-  set any(AnyRules v) { setField(20, v); }
+  set any(AnyRules v) { $_setField(20, v); }
   @$pb.TagNumber(20)
   $core.bool hasAny() => $_has(19);
   @$pb.TagNumber(20)
-  void clearAny() => clearField(20);
+  void clearAny() => $_clearField(20);
   @$pb.TagNumber(20)
   AnyRules ensureAny() => $_ensure(19);
 
   @$pb.TagNumber(21)
   DurationRules get duration => $_getN(20);
   @$pb.TagNumber(21)
-  set duration(DurationRules v) { setField(21, v); }
+  set duration(DurationRules v) { $_setField(21, v); }
   @$pb.TagNumber(21)
   $core.bool hasDuration() => $_has(20);
   @$pb.TagNumber(21)
-  void clearDuration() => clearField(21);
+  void clearDuration() => $_clearField(21);
   @$pb.TagNumber(21)
   DurationRules ensureDuration() => $_ensure(20);
 
   @$pb.TagNumber(22)
   TimestampRules get timestamp => $_getN(21);
   @$pb.TagNumber(22)
-  set timestamp(TimestampRules v) { setField(22, v); }
+  set timestamp(TimestampRules v) { $_setField(22, v); }
   @$pb.TagNumber(22)
   $core.bool hasTimestamp() => $_has(21);
   @$pb.TagNumber(22)
-  void clearTimestamp() => clearField(22);
+  void clearTimestamp() => $_clearField(22);
   @$pb.TagNumber(22)
   TimestampRules ensureTimestamp() => $_ensure(21);
 }
@@ -555,7 +557,7 @@ class FloatRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasConst_1() => $_has(0);
   @$pb.TagNumber(1)
-  void clearConst_1() => clearField(1);
+  void clearConst_1() => $_clearField(1);
 
   /// Lt specifies that this field must be less than the specified value,
   /// exclusive
@@ -566,7 +568,7 @@ class FloatRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasLt() => $_has(1);
   @$pb.TagNumber(2)
-  void clearLt() => clearField(2);
+  void clearLt() => $_clearField(2);
 
   /// Lte specifies that this field must be less than or equal to the
   /// specified value, inclusive
@@ -577,7 +579,7 @@ class FloatRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasLte() => $_has(2);
   @$pb.TagNumber(3)
-  void clearLte() => clearField(3);
+  void clearLte() => $_clearField(3);
 
   /// Gt specifies that this field must be greater than the specified value,
   /// exclusive. If the value of Gt is larger than a specified Lt or Lte, the
@@ -589,7 +591,7 @@ class FloatRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasGt() => $_has(3);
   @$pb.TagNumber(4)
-  void clearGt() => clearField(4);
+  void clearGt() => $_clearField(4);
 
   /// Gte specifies that this field must be greater than or equal to the
   /// specified value, inclusive. If the value of Gte is larger than a
@@ -601,17 +603,17 @@ class FloatRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $core.bool hasGte() => $_has(4);
   @$pb.TagNumber(5)
-  void clearGte() => clearField(5);
+  void clearGte() => $_clearField(5);
 
   /// In specifies that this field must be equal to one of the specified
   /// values
   @$pb.TagNumber(6)
-  $core.List<$core.double> get in_6 => $_getList(5);
+  $pb.PbList<$core.double> get in_6 => $_getList(5);
 
   /// NotIn specifies that this field cannot be equal to one of the specified
   /// values
   @$pb.TagNumber(7)
-  $core.List<$core.double> get notIn => $_getList(6);
+  $pb.PbList<$core.double> get notIn => $_getList(6);
 
   /// unauthorized specifies that this field cannot be written.
   @$pb.TagNumber(8)
@@ -621,7 +623,7 @@ class FloatRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(8)
   $core.bool hasUnauthorized() => $_has(7);
   @$pb.TagNumber(8)
-  void clearUnauthorized() => clearField(8);
+  void clearUnauthorized() => $_clearField(8);
 
   /// IgnoreEmpty specifies that the validation rules of this field should be
   /// evaluated only if the field is not empty
@@ -632,7 +634,7 @@ class FloatRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(9)
   $core.bool hasIgnoreEmpty() => $_has(8);
   @$pb.TagNumber(9)
-  void clearIgnoreEmpty() => clearField(9);
+  void clearIgnoreEmpty() => $_clearField(9);
 }
 
 /// DoubleRules describes the constraints applied to `double` values
@@ -724,7 +726,7 @@ class DoubleRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasConst_1() => $_has(0);
   @$pb.TagNumber(1)
-  void clearConst_1() => clearField(1);
+  void clearConst_1() => $_clearField(1);
 
   /// Lt specifies that this field must be less than the specified value,
   /// exclusive
@@ -735,7 +737,7 @@ class DoubleRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasLt() => $_has(1);
   @$pb.TagNumber(2)
-  void clearLt() => clearField(2);
+  void clearLt() => $_clearField(2);
 
   /// Lte specifies that this field must be less than or equal to the
   /// specified value, inclusive
@@ -746,7 +748,7 @@ class DoubleRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasLte() => $_has(2);
   @$pb.TagNumber(3)
-  void clearLte() => clearField(3);
+  void clearLte() => $_clearField(3);
 
   /// Gt specifies that this field must be greater than the specified value,
   /// exclusive. If the value of Gt is larger than a specified Lt or Lte, the
@@ -758,7 +760,7 @@ class DoubleRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasGt() => $_has(3);
   @$pb.TagNumber(4)
-  void clearGt() => clearField(4);
+  void clearGt() => $_clearField(4);
 
   /// Gte specifies that this field must be greater than or equal to the
   /// specified value, inclusive. If the value of Gte is larger than a
@@ -770,17 +772,17 @@ class DoubleRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $core.bool hasGte() => $_has(4);
   @$pb.TagNumber(5)
-  void clearGte() => clearField(5);
+  void clearGte() => $_clearField(5);
 
   /// In specifies that this field must be equal to one of the specified
   /// values
   @$pb.TagNumber(6)
-  $core.List<$core.double> get in_6 => $_getList(5);
+  $pb.PbList<$core.double> get in_6 => $_getList(5);
 
   /// NotIn specifies that this field cannot be equal to one of the specified
   /// values
   @$pb.TagNumber(7)
-  $core.List<$core.double> get notIn => $_getList(6);
+  $pb.PbList<$core.double> get notIn => $_getList(6);
 
   /// unauthorized specifies that this field cannot be written.
   @$pb.TagNumber(8)
@@ -790,7 +792,7 @@ class DoubleRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(8)
   $core.bool hasUnauthorized() => $_has(7);
   @$pb.TagNumber(8)
-  void clearUnauthorized() => clearField(8);
+  void clearUnauthorized() => $_clearField(8);
 
   /// IgnoreEmpty specifies that the validation rules of this field should be
   /// evaluated only if the field is not empty
@@ -801,7 +803,7 @@ class DoubleRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(9)
   $core.bool hasIgnoreEmpty() => $_has(8);
   @$pb.TagNumber(9)
-  void clearIgnoreEmpty() => clearField(9);
+  void clearIgnoreEmpty() => $_clearField(9);
 }
 
 /// Int32Rules describes the constraints applied to `int32` values
@@ -893,7 +895,7 @@ class Int32Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasConst_1() => $_has(0);
   @$pb.TagNumber(1)
-  void clearConst_1() => clearField(1);
+  void clearConst_1() => $_clearField(1);
 
   /// Lt specifies that this field must be less than the specified value,
   /// exclusive
@@ -904,7 +906,7 @@ class Int32Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasLt() => $_has(1);
   @$pb.TagNumber(2)
-  void clearLt() => clearField(2);
+  void clearLt() => $_clearField(2);
 
   /// Lte specifies that this field must be less than or equal to the
   /// specified value, inclusive
@@ -915,7 +917,7 @@ class Int32Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasLte() => $_has(2);
   @$pb.TagNumber(3)
-  void clearLte() => clearField(3);
+  void clearLte() => $_clearField(3);
 
   /// Gt specifies that this field must be greater than the specified value,
   /// exclusive. If the value of Gt is larger than a specified Lt or Lte, the
@@ -927,7 +929,7 @@ class Int32Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasGt() => $_has(3);
   @$pb.TagNumber(4)
-  void clearGt() => clearField(4);
+  void clearGt() => $_clearField(4);
 
   /// Gte specifies that this field must be greater than or equal to the
   /// specified value, inclusive. If the value of Gte is larger than a
@@ -939,17 +941,17 @@ class Int32Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $core.bool hasGte() => $_has(4);
   @$pb.TagNumber(5)
-  void clearGte() => clearField(5);
+  void clearGte() => $_clearField(5);
 
   /// In specifies that this field must be equal to one of the specified
   /// values
   @$pb.TagNumber(6)
-  $core.List<$core.int> get in_6 => $_getList(5);
+  $pb.PbList<$core.int> get in_6 => $_getList(5);
 
   /// NotIn specifies that this field cannot be equal to one of the specified
   /// values
   @$pb.TagNumber(7)
-  $core.List<$core.int> get notIn => $_getList(6);
+  $pb.PbList<$core.int> get notIn => $_getList(6);
 
   /// unauthorized specifies that this field cannot be written.
   @$pb.TagNumber(8)
@@ -959,7 +961,7 @@ class Int32Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(8)
   $core.bool hasUnauthorized() => $_has(7);
   @$pb.TagNumber(8)
-  void clearUnauthorized() => clearField(8);
+  void clearUnauthorized() => $_clearField(8);
 
   /// IgnoreEmpty specifies that the validation rules of this field should be
   /// evaluated only if the field is not empty
@@ -970,7 +972,7 @@ class Int32Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(9)
   $core.bool hasIgnoreEmpty() => $_has(8);
   @$pb.TagNumber(9)
-  void clearIgnoreEmpty() => clearField(9);
+  void clearIgnoreEmpty() => $_clearField(9);
 }
 
 /// Int64Rules describes the constraints applied to `int64` values
@@ -1062,7 +1064,7 @@ class Int64Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasConst_1() => $_has(0);
   @$pb.TagNumber(1)
-  void clearConst_1() => clearField(1);
+  void clearConst_1() => $_clearField(1);
 
   /// Lt specifies that this field must be less than the specified value,
   /// exclusive
@@ -1073,7 +1075,7 @@ class Int64Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasLt() => $_has(1);
   @$pb.TagNumber(2)
-  void clearLt() => clearField(2);
+  void clearLt() => $_clearField(2);
 
   /// Lte specifies that this field must be less than or equal to the
   /// specified value, inclusive
@@ -1084,7 +1086,7 @@ class Int64Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasLte() => $_has(2);
   @$pb.TagNumber(3)
-  void clearLte() => clearField(3);
+  void clearLte() => $_clearField(3);
 
   /// Gt specifies that this field must be greater than the specified value,
   /// exclusive. If the value of Gt is larger than a specified Lt or Lte, the
@@ -1096,7 +1098,7 @@ class Int64Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasGt() => $_has(3);
   @$pb.TagNumber(4)
-  void clearGt() => clearField(4);
+  void clearGt() => $_clearField(4);
 
   /// Gte specifies that this field must be greater than or equal to the
   /// specified value, inclusive. If the value of Gte is larger than a
@@ -1108,17 +1110,17 @@ class Int64Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $core.bool hasGte() => $_has(4);
   @$pb.TagNumber(5)
-  void clearGte() => clearField(5);
+  void clearGte() => $_clearField(5);
 
   /// In specifies that this field must be equal to one of the specified
   /// values
   @$pb.TagNumber(6)
-  $core.List<$fixnum.Int64> get in_6 => $_getList(5);
+  $pb.PbList<$fixnum.Int64> get in_6 => $_getList(5);
 
   /// NotIn specifies that this field cannot be equal to one of the specified
   /// values
   @$pb.TagNumber(7)
-  $core.List<$fixnum.Int64> get notIn => $_getList(6);
+  $pb.PbList<$fixnum.Int64> get notIn => $_getList(6);
 
   /// unauthorized specifies that this field cannot be written.
   @$pb.TagNumber(8)
@@ -1128,7 +1130,7 @@ class Int64Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(8)
   $core.bool hasUnauthorized() => $_has(7);
   @$pb.TagNumber(8)
-  void clearUnauthorized() => clearField(8);
+  void clearUnauthorized() => $_clearField(8);
 
   /// IgnoreEmpty specifies that the validation rules of this field should be
   /// evaluated only if the field is not empty
@@ -1139,7 +1141,7 @@ class Int64Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(9)
   $core.bool hasIgnoreEmpty() => $_has(8);
   @$pb.TagNumber(9)
-  void clearIgnoreEmpty() => clearField(9);
+  void clearIgnoreEmpty() => $_clearField(9);
 }
 
 /// UInt32Rules describes the constraints applied to `uint32` values
@@ -1231,7 +1233,7 @@ class UInt32Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasConst_1() => $_has(0);
   @$pb.TagNumber(1)
-  void clearConst_1() => clearField(1);
+  void clearConst_1() => $_clearField(1);
 
   /// Lt specifies that this field must be less than the specified value,
   /// exclusive
@@ -1242,7 +1244,7 @@ class UInt32Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasLt() => $_has(1);
   @$pb.TagNumber(2)
-  void clearLt() => clearField(2);
+  void clearLt() => $_clearField(2);
 
   /// Lte specifies that this field must be less than or equal to the
   /// specified value, inclusive
@@ -1253,7 +1255,7 @@ class UInt32Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasLte() => $_has(2);
   @$pb.TagNumber(3)
-  void clearLte() => clearField(3);
+  void clearLte() => $_clearField(3);
 
   /// Gt specifies that this field must be greater than the specified value,
   /// exclusive. If the value of Gt is larger than a specified Lt or Lte, the
@@ -1265,7 +1267,7 @@ class UInt32Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasGt() => $_has(3);
   @$pb.TagNumber(4)
-  void clearGt() => clearField(4);
+  void clearGt() => $_clearField(4);
 
   /// Gte specifies that this field must be greater than or equal to the
   /// specified value, inclusive. If the value of Gte is larger than a
@@ -1277,17 +1279,17 @@ class UInt32Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $core.bool hasGte() => $_has(4);
   @$pb.TagNumber(5)
-  void clearGte() => clearField(5);
+  void clearGte() => $_clearField(5);
 
   /// In specifies that this field must be equal to one of the specified
   /// values
   @$pb.TagNumber(6)
-  $core.List<$core.int> get in_6 => $_getList(5);
+  $pb.PbList<$core.int> get in_6 => $_getList(5);
 
   /// NotIn specifies that this field cannot be equal to one of the specified
   /// values
   @$pb.TagNumber(7)
-  $core.List<$core.int> get notIn => $_getList(6);
+  $pb.PbList<$core.int> get notIn => $_getList(6);
 
   /// unauthorized specifies that this field cannot be written.
   @$pb.TagNumber(8)
@@ -1297,7 +1299,7 @@ class UInt32Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(8)
   $core.bool hasUnauthorized() => $_has(7);
   @$pb.TagNumber(8)
-  void clearUnauthorized() => clearField(8);
+  void clearUnauthorized() => $_clearField(8);
 
   /// IgnoreEmpty specifies that the validation rules of this field should be
   /// evaluated only if the field is not empty
@@ -1308,7 +1310,7 @@ class UInt32Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(9)
   $core.bool hasIgnoreEmpty() => $_has(8);
   @$pb.TagNumber(9)
-  void clearIgnoreEmpty() => clearField(9);
+  void clearIgnoreEmpty() => $_clearField(9);
 }
 
 /// UInt64Rules describes the constraints applied to `uint64` values
@@ -1400,7 +1402,7 @@ class UInt64Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasConst_1() => $_has(0);
   @$pb.TagNumber(1)
-  void clearConst_1() => clearField(1);
+  void clearConst_1() => $_clearField(1);
 
   /// Lt specifies that this field must be less than the specified value,
   /// exclusive
@@ -1411,7 +1413,7 @@ class UInt64Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasLt() => $_has(1);
   @$pb.TagNumber(2)
-  void clearLt() => clearField(2);
+  void clearLt() => $_clearField(2);
 
   /// Lte specifies that this field must be less than or equal to the
   /// specified value, inclusive
@@ -1422,7 +1424,7 @@ class UInt64Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasLte() => $_has(2);
   @$pb.TagNumber(3)
-  void clearLte() => clearField(3);
+  void clearLte() => $_clearField(3);
 
   /// Gt specifies that this field must be greater than the specified value,
   /// exclusive. If the value of Gt is larger than a specified Lt or Lte, the
@@ -1434,7 +1436,7 @@ class UInt64Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasGt() => $_has(3);
   @$pb.TagNumber(4)
-  void clearGt() => clearField(4);
+  void clearGt() => $_clearField(4);
 
   /// Gte specifies that this field must be greater than or equal to the
   /// specified value, inclusive. If the value of Gte is larger than a
@@ -1446,17 +1448,17 @@ class UInt64Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $core.bool hasGte() => $_has(4);
   @$pb.TagNumber(5)
-  void clearGte() => clearField(5);
+  void clearGte() => $_clearField(5);
 
   /// In specifies that this field must be equal to one of the specified
   /// values
   @$pb.TagNumber(6)
-  $core.List<$fixnum.Int64> get in_6 => $_getList(5);
+  $pb.PbList<$fixnum.Int64> get in_6 => $_getList(5);
 
   /// NotIn specifies that this field cannot be equal to one of the specified
   /// values
   @$pb.TagNumber(7)
-  $core.List<$fixnum.Int64> get notIn => $_getList(6);
+  $pb.PbList<$fixnum.Int64> get notIn => $_getList(6);
 
   /// unauthorized specifies that this field cannot be written.
   @$pb.TagNumber(8)
@@ -1466,7 +1468,7 @@ class UInt64Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(8)
   $core.bool hasUnauthorized() => $_has(7);
   @$pb.TagNumber(8)
-  void clearUnauthorized() => clearField(8);
+  void clearUnauthorized() => $_clearField(8);
 
   /// IgnoreEmpty specifies that the validation rules of this field should be
   /// evaluated only if the field is not empty
@@ -1477,7 +1479,7 @@ class UInt64Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(9)
   $core.bool hasIgnoreEmpty() => $_has(8);
   @$pb.TagNumber(9)
-  void clearIgnoreEmpty() => clearField(9);
+  void clearIgnoreEmpty() => $_clearField(9);
 }
 
 /// SInt32Rules describes the constraints applied to `sint32` values
@@ -1569,7 +1571,7 @@ class SInt32Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasConst_1() => $_has(0);
   @$pb.TagNumber(1)
-  void clearConst_1() => clearField(1);
+  void clearConst_1() => $_clearField(1);
 
   /// Lt specifies that this field must be less than the specified value,
   /// exclusive
@@ -1580,7 +1582,7 @@ class SInt32Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasLt() => $_has(1);
   @$pb.TagNumber(2)
-  void clearLt() => clearField(2);
+  void clearLt() => $_clearField(2);
 
   /// Lte specifies that this field must be less than or equal to the
   /// specified value, inclusive
@@ -1591,7 +1593,7 @@ class SInt32Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasLte() => $_has(2);
   @$pb.TagNumber(3)
-  void clearLte() => clearField(3);
+  void clearLte() => $_clearField(3);
 
   /// Gt specifies that this field must be greater than the specified value,
   /// exclusive. If the value of Gt is larger than a specified Lt or Lte, the
@@ -1603,7 +1605,7 @@ class SInt32Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasGt() => $_has(3);
   @$pb.TagNumber(4)
-  void clearGt() => clearField(4);
+  void clearGt() => $_clearField(4);
 
   /// Gte specifies that this field must be greater than or equal to the
   /// specified value, inclusive. If the value of Gte is larger than a
@@ -1615,17 +1617,17 @@ class SInt32Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $core.bool hasGte() => $_has(4);
   @$pb.TagNumber(5)
-  void clearGte() => clearField(5);
+  void clearGte() => $_clearField(5);
 
   /// In specifies that this field must be equal to one of the specified
   /// values
   @$pb.TagNumber(6)
-  $core.List<$core.int> get in_6 => $_getList(5);
+  $pb.PbList<$core.int> get in_6 => $_getList(5);
 
   /// NotIn specifies that this field cannot be equal to one of the specified
   /// values
   @$pb.TagNumber(7)
-  $core.List<$core.int> get notIn => $_getList(6);
+  $pb.PbList<$core.int> get notIn => $_getList(6);
 
   /// unauthorized specifies that this field cannot be written.
   @$pb.TagNumber(8)
@@ -1635,7 +1637,7 @@ class SInt32Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(8)
   $core.bool hasUnauthorized() => $_has(7);
   @$pb.TagNumber(8)
-  void clearUnauthorized() => clearField(8);
+  void clearUnauthorized() => $_clearField(8);
 
   /// IgnoreEmpty specifies that the validation rules of this field should be
   /// evaluated only if the field is not empty
@@ -1646,7 +1648,7 @@ class SInt32Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(9)
   $core.bool hasIgnoreEmpty() => $_has(8);
   @$pb.TagNumber(9)
-  void clearIgnoreEmpty() => clearField(9);
+  void clearIgnoreEmpty() => $_clearField(9);
 }
 
 /// SInt64Rules describes the constraints applied to `sint64` values
@@ -1738,7 +1740,7 @@ class SInt64Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasConst_1() => $_has(0);
   @$pb.TagNumber(1)
-  void clearConst_1() => clearField(1);
+  void clearConst_1() => $_clearField(1);
 
   /// Lt specifies that this field must be less than the specified value,
   /// exclusive
@@ -1749,7 +1751,7 @@ class SInt64Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasLt() => $_has(1);
   @$pb.TagNumber(2)
-  void clearLt() => clearField(2);
+  void clearLt() => $_clearField(2);
 
   /// Lte specifies that this field must be less than or equal to the
   /// specified value, inclusive
@@ -1760,7 +1762,7 @@ class SInt64Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasLte() => $_has(2);
   @$pb.TagNumber(3)
-  void clearLte() => clearField(3);
+  void clearLte() => $_clearField(3);
 
   /// Gt specifies that this field must be greater than the specified value,
   /// exclusive. If the value of Gt is larger than a specified Lt or Lte, the
@@ -1772,7 +1774,7 @@ class SInt64Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasGt() => $_has(3);
   @$pb.TagNumber(4)
-  void clearGt() => clearField(4);
+  void clearGt() => $_clearField(4);
 
   /// Gte specifies that this field must be greater than or equal to the
   /// specified value, inclusive. If the value of Gte is larger than a
@@ -1784,17 +1786,17 @@ class SInt64Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $core.bool hasGte() => $_has(4);
   @$pb.TagNumber(5)
-  void clearGte() => clearField(5);
+  void clearGte() => $_clearField(5);
 
   /// In specifies that this field must be equal to one of the specified
   /// values
   @$pb.TagNumber(6)
-  $core.List<$fixnum.Int64> get in_6 => $_getList(5);
+  $pb.PbList<$fixnum.Int64> get in_6 => $_getList(5);
 
   /// NotIn specifies that this field cannot be equal to one of the specified
   /// values
   @$pb.TagNumber(7)
-  $core.List<$fixnum.Int64> get notIn => $_getList(6);
+  $pb.PbList<$fixnum.Int64> get notIn => $_getList(6);
 
   /// unauthorized specifies that this field cannot be written.
   @$pb.TagNumber(8)
@@ -1804,7 +1806,7 @@ class SInt64Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(8)
   $core.bool hasUnauthorized() => $_has(7);
   @$pb.TagNumber(8)
-  void clearUnauthorized() => clearField(8);
+  void clearUnauthorized() => $_clearField(8);
 
   /// IgnoreEmpty specifies that the validation rules of this field should be
   /// evaluated only if the field is not empty
@@ -1815,7 +1817,7 @@ class SInt64Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(9)
   $core.bool hasIgnoreEmpty() => $_has(8);
   @$pb.TagNumber(9)
-  void clearIgnoreEmpty() => clearField(9);
+  void clearIgnoreEmpty() => $_clearField(9);
 }
 
 /// Fixed32Rules describes the constraints applied to `fixed32` values
@@ -1907,7 +1909,7 @@ class Fixed32Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasConst_1() => $_has(0);
   @$pb.TagNumber(1)
-  void clearConst_1() => clearField(1);
+  void clearConst_1() => $_clearField(1);
 
   /// Lt specifies that this field must be less than the specified value,
   /// exclusive
@@ -1918,7 +1920,7 @@ class Fixed32Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasLt() => $_has(1);
   @$pb.TagNumber(2)
-  void clearLt() => clearField(2);
+  void clearLt() => $_clearField(2);
 
   /// Lte specifies that this field must be less than or equal to the
   /// specified value, inclusive
@@ -1929,7 +1931,7 @@ class Fixed32Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasLte() => $_has(2);
   @$pb.TagNumber(3)
-  void clearLte() => clearField(3);
+  void clearLte() => $_clearField(3);
 
   /// Gt specifies that this field must be greater than the specified value,
   /// exclusive. If the value of Gt is larger than a specified Lt or Lte, the
@@ -1941,7 +1943,7 @@ class Fixed32Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasGt() => $_has(3);
   @$pb.TagNumber(4)
-  void clearGt() => clearField(4);
+  void clearGt() => $_clearField(4);
 
   /// Gte specifies that this field must be greater than or equal to the
   /// specified value, inclusive. If the value of Gte is larger than a
@@ -1953,17 +1955,17 @@ class Fixed32Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $core.bool hasGte() => $_has(4);
   @$pb.TagNumber(5)
-  void clearGte() => clearField(5);
+  void clearGte() => $_clearField(5);
 
   /// In specifies that this field must be equal to one of the specified
   /// values
   @$pb.TagNumber(6)
-  $core.List<$core.int> get in_6 => $_getList(5);
+  $pb.PbList<$core.int> get in_6 => $_getList(5);
 
   /// NotIn specifies that this field cannot be equal to one of the specified
   /// values
   @$pb.TagNumber(7)
-  $core.List<$core.int> get notIn => $_getList(6);
+  $pb.PbList<$core.int> get notIn => $_getList(6);
 
   /// unauthorized specifies that this field cannot be written.
   @$pb.TagNumber(8)
@@ -1973,7 +1975,7 @@ class Fixed32Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(8)
   $core.bool hasUnauthorized() => $_has(7);
   @$pb.TagNumber(8)
-  void clearUnauthorized() => clearField(8);
+  void clearUnauthorized() => $_clearField(8);
 
   /// IgnoreEmpty specifies that the validation rules of this field should be
   /// evaluated only if the field is not empty
@@ -1984,7 +1986,7 @@ class Fixed32Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(9)
   $core.bool hasIgnoreEmpty() => $_has(8);
   @$pb.TagNumber(9)
-  void clearIgnoreEmpty() => clearField(9);
+  void clearIgnoreEmpty() => $_clearField(9);
 }
 
 /// Fixed64Rules describes the constraints applied to `fixed64` values
@@ -2076,7 +2078,7 @@ class Fixed64Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasConst_1() => $_has(0);
   @$pb.TagNumber(1)
-  void clearConst_1() => clearField(1);
+  void clearConst_1() => $_clearField(1);
 
   /// Lt specifies that this field must be less than the specified value,
   /// exclusive
@@ -2087,7 +2089,7 @@ class Fixed64Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasLt() => $_has(1);
   @$pb.TagNumber(2)
-  void clearLt() => clearField(2);
+  void clearLt() => $_clearField(2);
 
   /// Lte specifies that this field must be less than or equal to the
   /// specified value, inclusive
@@ -2098,7 +2100,7 @@ class Fixed64Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasLte() => $_has(2);
   @$pb.TagNumber(3)
-  void clearLte() => clearField(3);
+  void clearLte() => $_clearField(3);
 
   /// Gt specifies that this field must be greater than the specified value,
   /// exclusive. If the value of Gt is larger than a specified Lt or Lte, the
@@ -2110,7 +2112,7 @@ class Fixed64Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasGt() => $_has(3);
   @$pb.TagNumber(4)
-  void clearGt() => clearField(4);
+  void clearGt() => $_clearField(4);
 
   /// Gte specifies that this field must be greater than or equal to the
   /// specified value, inclusive. If the value of Gte is larger than a
@@ -2122,17 +2124,17 @@ class Fixed64Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $core.bool hasGte() => $_has(4);
   @$pb.TagNumber(5)
-  void clearGte() => clearField(5);
+  void clearGte() => $_clearField(5);
 
   /// In specifies that this field must be equal to one of the specified
   /// values
   @$pb.TagNumber(6)
-  $core.List<$fixnum.Int64> get in_6 => $_getList(5);
+  $pb.PbList<$fixnum.Int64> get in_6 => $_getList(5);
 
   /// NotIn specifies that this field cannot be equal to one of the specified
   /// values
   @$pb.TagNumber(7)
-  $core.List<$fixnum.Int64> get notIn => $_getList(6);
+  $pb.PbList<$fixnum.Int64> get notIn => $_getList(6);
 
   /// unauthorized specifies that this field cannot be written.
   @$pb.TagNumber(8)
@@ -2142,7 +2144,7 @@ class Fixed64Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(8)
   $core.bool hasUnauthorized() => $_has(7);
   @$pb.TagNumber(8)
-  void clearUnauthorized() => clearField(8);
+  void clearUnauthorized() => $_clearField(8);
 
   /// IgnoreEmpty specifies that the validation rules of this field should be
   /// evaluated only if the field is not empty
@@ -2153,7 +2155,7 @@ class Fixed64Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(9)
   $core.bool hasIgnoreEmpty() => $_has(8);
   @$pb.TagNumber(9)
-  void clearIgnoreEmpty() => clearField(9);
+  void clearIgnoreEmpty() => $_clearField(9);
 }
 
 /// SFixed32Rules describes the constraints applied to `sfixed32` values
@@ -2245,7 +2247,7 @@ class SFixed32Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasConst_1() => $_has(0);
   @$pb.TagNumber(1)
-  void clearConst_1() => clearField(1);
+  void clearConst_1() => $_clearField(1);
 
   /// Lt specifies that this field must be less than the specified value,
   /// exclusive
@@ -2256,7 +2258,7 @@ class SFixed32Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasLt() => $_has(1);
   @$pb.TagNumber(2)
-  void clearLt() => clearField(2);
+  void clearLt() => $_clearField(2);
 
   /// Lte specifies that this field must be less than or equal to the
   /// specified value, inclusive
@@ -2267,7 +2269,7 @@ class SFixed32Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasLte() => $_has(2);
   @$pb.TagNumber(3)
-  void clearLte() => clearField(3);
+  void clearLte() => $_clearField(3);
 
   /// Gt specifies that this field must be greater than the specified value,
   /// exclusive. If the value of Gt is larger than a specified Lt or Lte, the
@@ -2279,7 +2281,7 @@ class SFixed32Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasGt() => $_has(3);
   @$pb.TagNumber(4)
-  void clearGt() => clearField(4);
+  void clearGt() => $_clearField(4);
 
   /// Gte specifies that this field must be greater than or equal to the
   /// specified value, inclusive. If the value of Gte is larger than a
@@ -2291,17 +2293,17 @@ class SFixed32Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $core.bool hasGte() => $_has(4);
   @$pb.TagNumber(5)
-  void clearGte() => clearField(5);
+  void clearGte() => $_clearField(5);
 
   /// In specifies that this field must be equal to one of the specified
   /// values
   @$pb.TagNumber(6)
-  $core.List<$core.int> get in_6 => $_getList(5);
+  $pb.PbList<$core.int> get in_6 => $_getList(5);
 
   /// NotIn specifies that this field cannot be equal to one of the specified
   /// values
   @$pb.TagNumber(7)
-  $core.List<$core.int> get notIn => $_getList(6);
+  $pb.PbList<$core.int> get notIn => $_getList(6);
 
   /// unauthorized specifies that this field cannot be written.
   @$pb.TagNumber(8)
@@ -2311,7 +2313,7 @@ class SFixed32Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(8)
   $core.bool hasUnauthorized() => $_has(7);
   @$pb.TagNumber(8)
-  void clearUnauthorized() => clearField(8);
+  void clearUnauthorized() => $_clearField(8);
 
   /// IgnoreEmpty specifies that the validation rules of this field should be
   /// evaluated only if the field is not empty
@@ -2322,7 +2324,7 @@ class SFixed32Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(9)
   $core.bool hasIgnoreEmpty() => $_has(8);
   @$pb.TagNumber(9)
-  void clearIgnoreEmpty() => clearField(9);
+  void clearIgnoreEmpty() => $_clearField(9);
 }
 
 /// SFixed64Rules describes the constraints applied to `sfixed64` values
@@ -2414,7 +2416,7 @@ class SFixed64Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasConst_1() => $_has(0);
   @$pb.TagNumber(1)
-  void clearConst_1() => clearField(1);
+  void clearConst_1() => $_clearField(1);
 
   /// Lt specifies that this field must be less than the specified value,
   /// exclusive
@@ -2425,7 +2427,7 @@ class SFixed64Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasLt() => $_has(1);
   @$pb.TagNumber(2)
-  void clearLt() => clearField(2);
+  void clearLt() => $_clearField(2);
 
   /// Lte specifies that this field must be less than or equal to the
   /// specified value, inclusive
@@ -2436,7 +2438,7 @@ class SFixed64Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasLte() => $_has(2);
   @$pb.TagNumber(3)
-  void clearLte() => clearField(3);
+  void clearLte() => $_clearField(3);
 
   /// Gt specifies that this field must be greater than the specified value,
   /// exclusive. If the value of Gt is larger than a specified Lt or Lte, the
@@ -2448,7 +2450,7 @@ class SFixed64Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasGt() => $_has(3);
   @$pb.TagNumber(4)
-  void clearGt() => clearField(4);
+  void clearGt() => $_clearField(4);
 
   /// Gte specifies that this field must be greater than or equal to the
   /// specified value, inclusive. If the value of Gte is larger than a
@@ -2460,17 +2462,17 @@ class SFixed64Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $core.bool hasGte() => $_has(4);
   @$pb.TagNumber(5)
-  void clearGte() => clearField(5);
+  void clearGte() => $_clearField(5);
 
   /// In specifies that this field must be equal to one of the specified
   /// values
   @$pb.TagNumber(6)
-  $core.List<$fixnum.Int64> get in_6 => $_getList(5);
+  $pb.PbList<$fixnum.Int64> get in_6 => $_getList(5);
 
   /// NotIn specifies that this field cannot be equal to one of the specified
   /// values
   @$pb.TagNumber(7)
-  $core.List<$fixnum.Int64> get notIn => $_getList(6);
+  $pb.PbList<$fixnum.Int64> get notIn => $_getList(6);
 
   /// unauthorized specifies that this field cannot be written.
   @$pb.TagNumber(8)
@@ -2480,7 +2482,7 @@ class SFixed64Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(8)
   $core.bool hasUnauthorized() => $_has(7);
   @$pb.TagNumber(8)
-  void clearUnauthorized() => clearField(8);
+  void clearUnauthorized() => $_clearField(8);
 
   /// IgnoreEmpty specifies that the validation rules of this field should be
   /// evaluated only if the field is not empty
@@ -2491,7 +2493,7 @@ class SFixed64Rules extends $pb.GeneratedMessage {
   @$pb.TagNumber(9)
   $core.bool hasIgnoreEmpty() => $_has(8);
   @$pb.TagNumber(9)
-  void clearIgnoreEmpty() => clearField(9);
+  void clearIgnoreEmpty() => $_clearField(9);
 }
 
 /// BoolRules describes the constraints applied to `bool` values
@@ -2548,7 +2550,7 @@ class BoolRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasConst_1() => $_has(0);
   @$pb.TagNumber(1)
-  void clearConst_1() => clearField(1);
+  void clearConst_1() => $_clearField(1);
 
   /// unauthorized specifies that this field cannot be written.
   @$pb.TagNumber(2)
@@ -2558,7 +2560,7 @@ class BoolRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasUnauthorized() => $_has(1);
   @$pb.TagNumber(2)
-  void clearUnauthorized() => clearField(2);
+  void clearUnauthorized() => $_clearField(2);
 }
 
 enum StringRules_WellKnown {
@@ -2782,7 +2784,7 @@ class StringRules extends $pb.GeneratedMessage {
   static StringRules? _defaultInstance;
 
   StringRules_WellKnown whichWellKnown() => _StringRules_WellKnownByTag[$_whichOneof(0)]!;
-  void clearWellKnown() => clearField($_whichOneof(0));
+  void clearWellKnown() => $_clearField($_whichOneof(0));
 
   /// Const specifies that this field must be exactly the specified value
   @$pb.TagNumber(1)
@@ -2792,7 +2794,7 @@ class StringRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasConst_1() => $_has(0);
   @$pb.TagNumber(1)
-  void clearConst_1() => clearField(1);
+  void clearConst_1() => $_clearField(1);
 
   /// MinLen specifies that this field must be the specified number of
   /// characters (Unicode code points) at a minimum. Note that the number of
@@ -2804,7 +2806,7 @@ class StringRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasMinLen() => $_has(1);
   @$pb.TagNumber(2)
-  void clearMinLen() => clearField(2);
+  void clearMinLen() => $_clearField(2);
 
   /// MaxLen specifies that this field must be the specified number of
   /// characters (Unicode code points) at a maximum. Note that the number of
@@ -2816,7 +2818,7 @@ class StringRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasMaxLen() => $_has(2);
   @$pb.TagNumber(3)
-  void clearMaxLen() => clearField(3);
+  void clearMaxLen() => $_clearField(3);
 
   /// MinBytes specifies that this field must be the specified number of bytes
   /// at a minimum
@@ -2827,7 +2829,7 @@ class StringRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasMinBytes() => $_has(3);
   @$pb.TagNumber(4)
-  void clearMinBytes() => clearField(4);
+  void clearMinBytes() => $_clearField(4);
 
   /// MaxBytes specifies that this field must be the specified number of bytes
   /// at a maximum
@@ -2838,7 +2840,7 @@ class StringRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $core.bool hasMaxBytes() => $_has(4);
   @$pb.TagNumber(5)
-  void clearMaxBytes() => clearField(5);
+  void clearMaxBytes() => $_clearField(5);
 
   /// Pattern specifes that this field must match against the specified
   /// regular expression (RE2 syntax). The included expression should elide
@@ -2850,7 +2852,7 @@ class StringRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(6)
   $core.bool hasPattern() => $_has(5);
   @$pb.TagNumber(6)
-  void clearPattern() => clearField(6);
+  void clearPattern() => $_clearField(6);
 
   /// Prefix specifies that this field must have the specified substring at
   /// the beginning of the string.
@@ -2861,7 +2863,7 @@ class StringRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(7)
   $core.bool hasPrefix() => $_has(6);
   @$pb.TagNumber(7)
-  void clearPrefix() => clearField(7);
+  void clearPrefix() => $_clearField(7);
 
   /// Suffix specifies that this field must have the specified substring at
   /// the end of the string.
@@ -2872,7 +2874,7 @@ class StringRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(8)
   $core.bool hasSuffix() => $_has(7);
   @$pb.TagNumber(8)
-  void clearSuffix() => clearField(8);
+  void clearSuffix() => $_clearField(8);
 
   /// Contains specifies that this field must have the specified substring
   /// anywhere in the string.
@@ -2883,17 +2885,17 @@ class StringRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(9)
   $core.bool hasContains() => $_has(8);
   @$pb.TagNumber(9)
-  void clearContains() => clearField(9);
+  void clearContains() => $_clearField(9);
 
   /// In specifies that this field must be equal to one of the specified
   /// values
   @$pb.TagNumber(10)
-  $core.List<$core.String> get in_10 => $_getList(9);
+  $pb.PbList<$core.String> get in_10 => $_getList(9);
 
   /// NotIn specifies that this field cannot be equal to one of the specified
   /// values
   @$pb.TagNumber(11)
-  $core.List<$core.String> get notIn => $_getList(10);
+  $pb.PbList<$core.String> get notIn => $_getList(10);
 
   /// Email specifies that the field must be a valid email address as
   /// defined by RFC 5322
@@ -2904,7 +2906,7 @@ class StringRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(12)
   $core.bool hasEmail() => $_has(11);
   @$pb.TagNumber(12)
-  void clearEmail() => clearField(12);
+  void clearEmail() => $_clearField(12);
 
   /// Hostname specifies that the field must be a valid hostname as
   /// defined by RFC 1034. This constraint does not support
@@ -2916,7 +2918,7 @@ class StringRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(13)
   $core.bool hasHostname() => $_has(12);
   @$pb.TagNumber(13)
-  void clearHostname() => clearField(13);
+  void clearHostname() => $_clearField(13);
 
   /// Ip specifies that the field must be a valid IP (v4 or v6) address.
   /// Valid IPv6 addresses should not include surrounding square brackets.
@@ -2927,7 +2929,7 @@ class StringRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(14)
   $core.bool hasIp() => $_has(13);
   @$pb.TagNumber(14)
-  void clearIp() => clearField(14);
+  void clearIp() => $_clearField(14);
 
   /// Ipv4 specifies that the field must be a valid IPv4 address.
   @$pb.TagNumber(15)
@@ -2937,7 +2939,7 @@ class StringRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(15)
   $core.bool hasIpv4() => $_has(14);
   @$pb.TagNumber(15)
-  void clearIpv4() => clearField(15);
+  void clearIpv4() => $_clearField(15);
 
   /// Ipv6 specifies that the field must be a valid IPv6 address. Valid
   /// IPv6 addresses should not include surrounding square brackets.
@@ -2948,7 +2950,7 @@ class StringRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(16)
   $core.bool hasIpv6() => $_has(15);
   @$pb.TagNumber(16)
-  void clearIpv6() => clearField(16);
+  void clearIpv6() => $_clearField(16);
 
   /// Uri specifies that the field must be a valid, absolute URI as defined
   /// by RFC 3986
@@ -2959,7 +2961,7 @@ class StringRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(17)
   $core.bool hasUri() => $_has(16);
   @$pb.TagNumber(17)
-  void clearUri() => clearField(17);
+  void clearUri() => $_clearField(17);
 
   /// UriRef specifies that the field must be a valid URI as defined by RFC
   /// 3986 and may be relative or absolute.
@@ -2970,7 +2972,7 @@ class StringRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(18)
   $core.bool hasUriRef() => $_has(17);
   @$pb.TagNumber(18)
-  void clearUriRef() => clearField(18);
+  void clearUriRef() => $_clearField(18);
 
   /// Len specifies that this field must be the specified number of
   /// characters (Unicode code points). Note that the number of
@@ -2982,7 +2984,7 @@ class StringRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(19)
   $core.bool hasLen() => $_has(18);
   @$pb.TagNumber(19)
-  void clearLen() => clearField(19);
+  void clearLen() => $_clearField(19);
 
   /// LenBytes specifies that this field must be the specified number of bytes
   /// at a minimum
@@ -2993,7 +2995,7 @@ class StringRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(20)
   $core.bool hasLenBytes() => $_has(19);
   @$pb.TagNumber(20)
-  void clearLenBytes() => clearField(20);
+  void clearLenBytes() => $_clearField(20);
 
   /// Address specifies that the field must be either a valid hostname as
   /// defined by RFC 1034 (which does not support internationalized domain
@@ -3005,7 +3007,7 @@ class StringRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(21)
   $core.bool hasAddress() => $_has(20);
   @$pb.TagNumber(21)
-  void clearAddress() => clearField(21);
+  void clearAddress() => $_clearField(21);
 
   /// Uuid specifies that the field must be a valid UUID as defined by
   /// RFC 4122
@@ -3016,7 +3018,7 @@ class StringRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(22)
   $core.bool hasUuid() => $_has(21);
   @$pb.TagNumber(22)
-  void clearUuid() => clearField(22);
+  void clearUuid() => $_clearField(22);
 
   /// NotContains specifies that this field cannot have the specified substring
   /// anywhere in the string.
@@ -3027,17 +3029,17 @@ class StringRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(23)
   $core.bool hasNotContains() => $_has(22);
   @$pb.TagNumber(23)
-  void clearNotContains() => clearField(23);
+  void clearNotContains() => $_clearField(23);
 
   /// WellKnownRegex specifies a common well known pattern defined as a regex.
   @$pb.TagNumber(24)
   KnownRegex get wellKnownRegex => $_getN(23);
   @$pb.TagNumber(24)
-  set wellKnownRegex(KnownRegex v) { setField(24, v); }
+  set wellKnownRegex(KnownRegex v) { $_setField(24, v); }
   @$pb.TagNumber(24)
   $core.bool hasWellKnownRegex() => $_has(23);
   @$pb.TagNumber(24)
-  void clearWellKnownRegex() => clearField(24);
+  void clearWellKnownRegex() => $_clearField(24);
 
   /// This applies to regexes HTTP_HEADER_NAME and HTTP_HEADER_VALUE to enable
   /// strict header validation.
@@ -3051,7 +3053,7 @@ class StringRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(25)
   $core.bool hasStrict() => $_has(24);
   @$pb.TagNumber(25)
-  void clearStrict() => clearField(25);
+  void clearStrict() => $_clearField(25);
 
   /// dateIso8601 specifes that the field must be either a valid date as
   /// defined by ISO 8601
@@ -3062,7 +3064,7 @@ class StringRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(26)
   $core.bool hasDateIso8601() => $_has(25);
   @$pb.TagNumber(26)
-  void clearDateIso8601() => clearField(26);
+  void clearDateIso8601() => $_clearField(26);
 
   /// languageIso639 specifes that the field must be either a valid language name as
   /// defined by ISO 639-1
@@ -3073,7 +3075,7 @@ class StringRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(27)
   $core.bool hasLanguageIso6391() => $_has(26);
   @$pb.TagNumber(27)
-  void clearLanguageIso6391() => clearField(27);
+  void clearLanguageIso6391() => $_clearField(27);
 
   /// tzData specifes that the field must be  location name
   /// corresponding to a file in the IANA Time Zone database, such as "America/New_York"
@@ -3084,7 +3086,7 @@ class StringRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(28)
   $core.bool hasTzData() => $_has(27);
   @$pb.TagNumber(28)
-  void clearTzData() => clearField(28);
+  void clearTzData() => $_clearField(28);
 
   /// unauthorized specifies that this field cannot be written.
   @$pb.TagNumber(29)
@@ -3094,7 +3096,7 @@ class StringRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(29)
   $core.bool hasUnauthorized() => $_has(28);
   @$pb.TagNumber(29)
-  void clearUnauthorized() => clearField(29);
+  void clearUnauthorized() => $_clearField(29);
 
   /// IgnoreEmpty specifies that the validation rules of this field should be
   /// evaluated only if the field is not empty
@@ -3105,7 +3107,7 @@ class StringRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(30)
   $core.bool hasIgnoreEmpty() => $_has(29);
   @$pb.TagNumber(30)
-  void clearIgnoreEmpty() => clearField(30);
+  void clearIgnoreEmpty() => $_clearField(30);
 }
 
 enum BytesRules_WellKnown {
@@ -3229,7 +3231,7 @@ class BytesRules extends $pb.GeneratedMessage {
   static BytesRules? _defaultInstance;
 
   BytesRules_WellKnown whichWellKnown() => _BytesRules_WellKnownByTag[$_whichOneof(0)]!;
-  void clearWellKnown() => clearField($_whichOneof(0));
+  void clearWellKnown() => $_clearField($_whichOneof(0));
 
   /// Const specifies that this field must be exactly the specified value
   @$pb.TagNumber(1)
@@ -3239,7 +3241,7 @@ class BytesRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasConst_1() => $_has(0);
   @$pb.TagNumber(1)
-  void clearConst_1() => clearField(1);
+  void clearConst_1() => $_clearField(1);
 
   /// MinLen specifies that this field must be the specified number of bytes
   /// at a minimum
@@ -3250,7 +3252,7 @@ class BytesRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasMinLen() => $_has(1);
   @$pb.TagNumber(2)
-  void clearMinLen() => clearField(2);
+  void clearMinLen() => $_clearField(2);
 
   /// MaxLen specifies that this field must be the specified number of bytes
   /// at a maximum
@@ -3261,7 +3263,7 @@ class BytesRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasMaxLen() => $_has(2);
   @$pb.TagNumber(3)
-  void clearMaxLen() => clearField(3);
+  void clearMaxLen() => $_clearField(3);
 
   /// Pattern specifes that this field must match against the specified
   /// regular expression (RE2 syntax). The included expression should elide
@@ -3273,7 +3275,7 @@ class BytesRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasPattern() => $_has(3);
   @$pb.TagNumber(4)
-  void clearPattern() => clearField(4);
+  void clearPattern() => $_clearField(4);
 
   /// Prefix specifies that this field must have the specified bytes at the
   /// beginning of the string.
@@ -3284,7 +3286,7 @@ class BytesRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $core.bool hasPrefix() => $_has(4);
   @$pb.TagNumber(5)
-  void clearPrefix() => clearField(5);
+  void clearPrefix() => $_clearField(5);
 
   /// Suffix specifies that this field must have the specified bytes at the
   /// end of the string.
@@ -3295,7 +3297,7 @@ class BytesRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(6)
   $core.bool hasSuffix() => $_has(5);
   @$pb.TagNumber(6)
-  void clearSuffix() => clearField(6);
+  void clearSuffix() => $_clearField(6);
 
   /// Contains specifies that this field must have the specified bytes
   /// anywhere in the string.
@@ -3306,17 +3308,17 @@ class BytesRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(7)
   $core.bool hasContains() => $_has(6);
   @$pb.TagNumber(7)
-  void clearContains() => clearField(7);
+  void clearContains() => $_clearField(7);
 
   /// In specifies that this field must be equal to one of the specified
   /// values
   @$pb.TagNumber(8)
-  $core.List<$core.List<$core.int>> get in_8 => $_getList(7);
+  $pb.PbList<$core.List<$core.int>> get in_8 => $_getList(7);
 
   /// NotIn specifies that this field cannot be equal to one of the specified
   /// values
   @$pb.TagNumber(9)
-  $core.List<$core.List<$core.int>> get notIn => $_getList(8);
+  $pb.PbList<$core.List<$core.int>> get notIn => $_getList(8);
 
   /// Ip specifies that the field must be a valid IP (v4 or v6) address in
   /// byte format
@@ -3327,7 +3329,7 @@ class BytesRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(10)
   $core.bool hasIp() => $_has(9);
   @$pb.TagNumber(10)
-  void clearIp() => clearField(10);
+  void clearIp() => $_clearField(10);
 
   /// Ipv4 specifies that the field must be a valid IPv4 address in byte
   /// format
@@ -3338,7 +3340,7 @@ class BytesRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(11)
   $core.bool hasIpv4() => $_has(10);
   @$pb.TagNumber(11)
-  void clearIpv4() => clearField(11);
+  void clearIpv4() => $_clearField(11);
 
   /// Ipv6 specifies that the field must be a valid IPv6 address in byte
   /// format
@@ -3349,7 +3351,7 @@ class BytesRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(12)
   $core.bool hasIpv6() => $_has(11);
   @$pb.TagNumber(12)
-  void clearIpv6() => clearField(12);
+  void clearIpv6() => $_clearField(12);
 
   /// Len specifies that this field must be the specified number of bytes
   @$pb.TagNumber(13)
@@ -3359,7 +3361,7 @@ class BytesRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(13)
   $core.bool hasLen() => $_has(12);
   @$pb.TagNumber(13)
-  void clearLen() => clearField(13);
+  void clearLen() => $_clearField(13);
 
   /// IgnoreEmpty specifies that the validation rules of this field should be
   /// evaluated only if the field is not empty
@@ -3370,7 +3372,7 @@ class BytesRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(14)
   $core.bool hasIgnoreEmpty() => $_has(13);
   @$pb.TagNumber(14)
-  void clearIgnoreEmpty() => clearField(14);
+  void clearIgnoreEmpty() => $_clearField(14);
 }
 
 /// EnumRules describe the constraints applied to enum values
@@ -3447,7 +3449,7 @@ class EnumRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasConst_1() => $_has(0);
   @$pb.TagNumber(1)
-  void clearConst_1() => clearField(1);
+  void clearConst_1() => $_clearField(1);
 
   /// DefinedOnly specifies that this field must be only one of the defined
   /// values for this enum, failing on any undefined value.
@@ -3458,17 +3460,17 @@ class EnumRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasDefinedOnly() => $_has(1);
   @$pb.TagNumber(2)
-  void clearDefinedOnly() => clearField(2);
+  void clearDefinedOnly() => $_clearField(2);
 
   /// In specifies that this field must be equal to one of the specified
   /// values
   @$pb.TagNumber(3)
-  $core.List<$core.int> get in_3 => $_getList(2);
+  $pb.PbList<$core.int> get in_3 => $_getList(2);
 
   /// NotIn specifies that this field cannot be equal to one of the specified
   /// values
   @$pb.TagNumber(4)
-  $core.List<$core.int> get notIn => $_getList(3);
+  $pb.PbList<$core.int> get notIn => $_getList(3);
 
   /// unauthorized specifies that this field cannot be written.
   @$pb.TagNumber(5)
@@ -3478,7 +3480,7 @@ class EnumRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $core.bool hasUnauthorized() => $_has(4);
   @$pb.TagNumber(5)
-  void clearUnauthorized() => clearField(5);
+  void clearUnauthorized() => $_clearField(5);
 
   /// IgnoreEmpty specifies that the validation rules of this field should be
   /// evaluated only if the field is not empty
@@ -3489,7 +3491,7 @@ class EnumRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(6)
   $core.bool hasIgnoreEmpty() => $_has(5);
   @$pb.TagNumber(6)
-  void clearIgnoreEmpty() => clearField(6);
+  void clearIgnoreEmpty() => $_clearField(6);
 }
 
 /// MessageRules describe the constraints applied to embedded message values.
@@ -3553,7 +3555,7 @@ class MessageRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasSkip() => $_has(0);
   @$pb.TagNumber(1)
-  void clearSkip() => clearField(1);
+  void clearSkip() => $_clearField(1);
 
   /// Required specifies that this field must be set
   @$pb.TagNumber(2)
@@ -3563,7 +3565,7 @@ class MessageRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasRequired() => $_has(1);
   @$pb.TagNumber(2)
-  void clearRequired() => clearField(2);
+  void clearRequired() => $_clearField(2);
 
   /// unauthorized specifies that this field cannot be written.
   @$pb.TagNumber(3)
@@ -3573,7 +3575,7 @@ class MessageRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasUnauthorized() => $_has(2);
   @$pb.TagNumber(3)
-  void clearUnauthorized() => clearField(3);
+  void clearUnauthorized() => $_clearField(3);
 }
 
 /// RepeatedRules describe the constraints applied to `repeated` values
@@ -3656,7 +3658,7 @@ class RepeatedRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasMinItems() => $_has(0);
   @$pb.TagNumber(1)
-  void clearMinItems() => clearField(1);
+  void clearMinItems() => $_clearField(1);
 
   /// MaxItems specifies that this field must have the specified number of
   /// items at a maximum
@@ -3667,7 +3669,7 @@ class RepeatedRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasMaxItems() => $_has(1);
   @$pb.TagNumber(2)
-  void clearMaxItems() => clearField(2);
+  void clearMaxItems() => $_clearField(2);
 
   /// Unique specifies that all elements in this field must be unique. This
   /// contraint is only applicable to scalar and enum types (messages are not
@@ -3679,7 +3681,7 @@ class RepeatedRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasUnique() => $_has(2);
   @$pb.TagNumber(3)
-  void clearUnique() => clearField(3);
+  void clearUnique() => $_clearField(3);
 
   /// Items specifies the contraints to be applied to each item in the field.
   /// Repeated message fields will still execute validation against each item
@@ -3687,11 +3689,11 @@ class RepeatedRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   FieldRules get items => $_getN(3);
   @$pb.TagNumber(4)
-  set items(FieldRules v) { setField(4, v); }
+  set items(FieldRules v) { $_setField(4, v); }
   @$pb.TagNumber(4)
   $core.bool hasItems() => $_has(3);
   @$pb.TagNumber(4)
-  void clearItems() => clearField(4);
+  void clearItems() => $_clearField(4);
   @$pb.TagNumber(4)
   FieldRules ensureItems() => $_ensure(3);
 
@@ -3705,7 +3707,7 @@ class RepeatedRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $core.bool hasUniqueBaseLV() => $_has(4);
   @$pb.TagNumber(5)
-  void clearUniqueBaseLV() => clearField(5);
+  void clearUniqueBaseLV() => $_clearField(5);
 
   /// knownRefLV specifies the business rule contraints to the IsBaseLogisticVariant nested field of the LogisticVariant item in the list.
   /// A VL can only refer (RefLV) to a base LV known on this article.
@@ -3717,7 +3719,7 @@ class RepeatedRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(6)
   $core.bool hasKnownRefLV() => $_has(5);
   @$pb.TagNumber(6)
-  void clearKnownRefLV() => clearField(6);
+  void clearKnownRefLV() => $_clearField(6);
 
   /// IgnoreEmpty specifies that the validation rules of this field should be
   /// evaluated only if the field is not empty
@@ -3728,7 +3730,7 @@ class RepeatedRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(7)
   $core.bool hasIgnoreEmpty() => $_has(6);
   @$pb.TagNumber(7)
-  void clearIgnoreEmpty() => clearField(7);
+  void clearIgnoreEmpty() => $_clearField(7);
 }
 
 /// MapRules describe the constraints applied to `map` values
@@ -3806,7 +3808,7 @@ class MapRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasMinPairs() => $_has(0);
   @$pb.TagNumber(1)
-  void clearMinPairs() => clearField(1);
+  void clearMinPairs() => $_clearField(1);
 
   /// MaxPairs specifies that this field must have the specified number of
   /// KVs at a maximum
@@ -3817,7 +3819,7 @@ class MapRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasMaxPairs() => $_has(1);
   @$pb.TagNumber(2)
-  void clearMaxPairs() => clearField(2);
+  void clearMaxPairs() => $_clearField(2);
 
   /// NoSparse specifies values in this field cannot be unset. This only
   /// applies to map's with message value types.
@@ -3828,17 +3830,17 @@ class MapRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasNoSparse() => $_has(2);
   @$pb.TagNumber(3)
-  void clearNoSparse() => clearField(3);
+  void clearNoSparse() => $_clearField(3);
 
   /// Keys specifies the constraints to be applied to each key in the field.
   @$pb.TagNumber(4)
   FieldRules get keys => $_getN(3);
   @$pb.TagNumber(4)
-  set keys(FieldRules v) { setField(4, v); }
+  set keys(FieldRules v) { $_setField(4, v); }
   @$pb.TagNumber(4)
   $core.bool hasKeys() => $_has(3);
   @$pb.TagNumber(4)
-  void clearKeys() => clearField(4);
+  void clearKeys() => $_clearField(4);
   @$pb.TagNumber(4)
   FieldRules ensureKeys() => $_ensure(3);
 
@@ -3848,11 +3850,11 @@ class MapRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   FieldRules get values => $_getN(4);
   @$pb.TagNumber(5)
-  set values(FieldRules v) { setField(5, v); }
+  set values(FieldRules v) { $_setField(5, v); }
   @$pb.TagNumber(5)
   $core.bool hasValues() => $_has(4);
   @$pb.TagNumber(5)
-  void clearValues() => clearField(5);
+  void clearValues() => $_clearField(5);
   @$pb.TagNumber(5)
   FieldRules ensureValues() => $_ensure(4);
 
@@ -3865,7 +3867,7 @@ class MapRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(6)
   $core.bool hasIgnoreEmpty() => $_has(5);
   @$pb.TagNumber(6)
-  void clearIgnoreEmpty() => clearField(6);
+  void clearIgnoreEmpty() => $_clearField(6);
 }
 
 /// AnyRules describe constraints applied exclusively to the
@@ -3928,17 +3930,17 @@ class AnyRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasRequired() => $_has(0);
   @$pb.TagNumber(1)
-  void clearRequired() => clearField(1);
+  void clearRequired() => $_clearField(1);
 
   /// In specifies that this field's `type_url` must be equal to one of the
   /// specified values.
   @$pb.TagNumber(2)
-  $core.List<$core.String> get in_2 => $_getList(1);
+  $pb.PbList<$core.String> get in_2 => $_getList(1);
 
   /// NotIn specifies that this field's `type_url` must not be equal to any of
   /// the specified values.
   @$pb.TagNumber(3)
-  $core.List<$core.String> get notIn => $_getList(2);
+  $pb.PbList<$core.String> get notIn => $_getList(2);
 }
 
 /// DurationRules describe the constraints applied exclusively to the
@@ -4026,17 +4028,17 @@ class DurationRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasRequired() => $_has(0);
   @$pb.TagNumber(1)
-  void clearRequired() => clearField(1);
+  void clearRequired() => $_clearField(1);
 
   /// Const specifies that this field must be exactly the specified value
   @$pb.TagNumber(2)
   $13.Duration get const_2 => $_getN(1);
   @$pb.TagNumber(2)
-  set const_2($13.Duration v) { setField(2, v); }
+  set const_2($13.Duration v) { $_setField(2, v); }
   @$pb.TagNumber(2)
   $core.bool hasConst_2() => $_has(1);
   @$pb.TagNumber(2)
-  void clearConst_2() => clearField(2);
+  void clearConst_2() => $_clearField(2);
   @$pb.TagNumber(2)
   $13.Duration ensureConst_2() => $_ensure(1);
 
@@ -4045,11 +4047,11 @@ class DurationRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $13.Duration get lt => $_getN(2);
   @$pb.TagNumber(3)
-  set lt($13.Duration v) { setField(3, v); }
+  set lt($13.Duration v) { $_setField(3, v); }
   @$pb.TagNumber(3)
   $core.bool hasLt() => $_has(2);
   @$pb.TagNumber(3)
-  void clearLt() => clearField(3);
+  void clearLt() => $_clearField(3);
   @$pb.TagNumber(3)
   $13.Duration ensureLt() => $_ensure(2);
 
@@ -4058,11 +4060,11 @@ class DurationRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $13.Duration get lte => $_getN(3);
   @$pb.TagNumber(4)
-  set lte($13.Duration v) { setField(4, v); }
+  set lte($13.Duration v) { $_setField(4, v); }
   @$pb.TagNumber(4)
   $core.bool hasLte() => $_has(3);
   @$pb.TagNumber(4)
-  void clearLte() => clearField(4);
+  void clearLte() => $_clearField(4);
   @$pb.TagNumber(4)
   $13.Duration ensureLte() => $_ensure(3);
 
@@ -4071,11 +4073,11 @@ class DurationRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $13.Duration get gt => $_getN(4);
   @$pb.TagNumber(5)
-  set gt($13.Duration v) { setField(5, v); }
+  set gt($13.Duration v) { $_setField(5, v); }
   @$pb.TagNumber(5)
   $core.bool hasGt() => $_has(4);
   @$pb.TagNumber(5)
-  void clearGt() => clearField(5);
+  void clearGt() => $_clearField(5);
   @$pb.TagNumber(5)
   $13.Duration ensureGt() => $_ensure(4);
 
@@ -4084,23 +4086,23 @@ class DurationRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(6)
   $13.Duration get gte => $_getN(5);
   @$pb.TagNumber(6)
-  set gte($13.Duration v) { setField(6, v); }
+  set gte($13.Duration v) { $_setField(6, v); }
   @$pb.TagNumber(6)
   $core.bool hasGte() => $_has(5);
   @$pb.TagNumber(6)
-  void clearGte() => clearField(6);
+  void clearGte() => $_clearField(6);
   @$pb.TagNumber(6)
   $13.Duration ensureGte() => $_ensure(5);
 
   /// In specifies that this field must be equal to one of the specified
   /// values
   @$pb.TagNumber(7)
-  $core.List<$13.Duration> get in_7 => $_getList(6);
+  $pb.PbList<$13.Duration> get in_7 => $_getList(6);
 
   /// NotIn specifies that this field cannot be equal to one of the specified
   /// values
   @$pb.TagNumber(8)
-  $core.List<$13.Duration> get notIn => $_getList(7);
+  $pb.PbList<$13.Duration> get notIn => $_getList(7);
 }
 
 /// TimestampRules describe the constraints applied exclusively to the
@@ -4193,17 +4195,17 @@ class TimestampRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasRequired() => $_has(0);
   @$pb.TagNumber(1)
-  void clearRequired() => clearField(1);
+  void clearRequired() => $_clearField(1);
 
   /// Const specifies that this field must be exactly the specified value
   @$pb.TagNumber(2)
   $14.Timestamp get const_2 => $_getN(1);
   @$pb.TagNumber(2)
-  set const_2($14.Timestamp v) { setField(2, v); }
+  set const_2($14.Timestamp v) { $_setField(2, v); }
   @$pb.TagNumber(2)
   $core.bool hasConst_2() => $_has(1);
   @$pb.TagNumber(2)
-  void clearConst_2() => clearField(2);
+  void clearConst_2() => $_clearField(2);
   @$pb.TagNumber(2)
   $14.Timestamp ensureConst_2() => $_ensure(1);
 
@@ -4212,11 +4214,11 @@ class TimestampRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $14.Timestamp get lt => $_getN(2);
   @$pb.TagNumber(3)
-  set lt($14.Timestamp v) { setField(3, v); }
+  set lt($14.Timestamp v) { $_setField(3, v); }
   @$pb.TagNumber(3)
   $core.bool hasLt() => $_has(2);
   @$pb.TagNumber(3)
-  void clearLt() => clearField(3);
+  void clearLt() => $_clearField(3);
   @$pb.TagNumber(3)
   $14.Timestamp ensureLt() => $_ensure(2);
 
@@ -4225,11 +4227,11 @@ class TimestampRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $14.Timestamp get lte => $_getN(3);
   @$pb.TagNumber(4)
-  set lte($14.Timestamp v) { setField(4, v); }
+  set lte($14.Timestamp v) { $_setField(4, v); }
   @$pb.TagNumber(4)
   $core.bool hasLte() => $_has(3);
   @$pb.TagNumber(4)
-  void clearLte() => clearField(4);
+  void clearLte() => $_clearField(4);
   @$pb.TagNumber(4)
   $14.Timestamp ensureLte() => $_ensure(3);
 
@@ -4238,11 +4240,11 @@ class TimestampRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $14.Timestamp get gt => $_getN(4);
   @$pb.TagNumber(5)
-  set gt($14.Timestamp v) { setField(5, v); }
+  set gt($14.Timestamp v) { $_setField(5, v); }
   @$pb.TagNumber(5)
   $core.bool hasGt() => $_has(4);
   @$pb.TagNumber(5)
-  void clearGt() => clearField(5);
+  void clearGt() => $_clearField(5);
   @$pb.TagNumber(5)
   $14.Timestamp ensureGt() => $_ensure(4);
 
@@ -4251,11 +4253,11 @@ class TimestampRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(6)
   $14.Timestamp get gte => $_getN(5);
   @$pb.TagNumber(6)
-  set gte($14.Timestamp v) { setField(6, v); }
+  set gte($14.Timestamp v) { $_setField(6, v); }
   @$pb.TagNumber(6)
   $core.bool hasGte() => $_has(5);
   @$pb.TagNumber(6)
-  void clearGte() => clearField(6);
+  void clearGte() => $_clearField(6);
   @$pb.TagNumber(6)
   $14.Timestamp ensureGte() => $_ensure(5);
 
@@ -4268,7 +4270,7 @@ class TimestampRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(7)
   $core.bool hasLtNow() => $_has(6);
   @$pb.TagNumber(7)
-  void clearLtNow() => clearField(7);
+  void clearLtNow() => $_clearField(7);
 
   /// GtNow specifies that this must be greater than the current time. GtNow
   /// can only be used with the Within rule.
@@ -4279,7 +4281,7 @@ class TimestampRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(8)
   $core.bool hasGtNow() => $_has(7);
   @$pb.TagNumber(8)
-  void clearGtNow() => clearField(8);
+  void clearGtNow() => $_clearField(8);
 
   /// Within specifies that this field must be within this duration of the
   /// current time. This constraint can be used alone or with the LtNow and
@@ -4287,11 +4289,11 @@ class TimestampRules extends $pb.GeneratedMessage {
   @$pb.TagNumber(9)
   $13.Duration get within => $_getN(8);
   @$pb.TagNumber(9)
-  set within($13.Duration v) { setField(9, v); }
+  set within($13.Duration v) { $_setField(9, v); }
   @$pb.TagNumber(9)
   $core.bool hasWithin() => $_has(8);
   @$pb.TagNumber(9)
-  void clearWithin() => clearField(9);
+  void clearWithin() => $_clearField(9);
   @$pb.TagNumber(9)
   $13.Duration ensureWithin() => $_ensure(8);
 }
diff --git a/lib/validate.pbenum.dart b/lib/validate.pbenum.dart
index 655c196..51d86c5 100644
--- a/lib/validate.pbenum.dart
+++ b/lib/validate.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: validate.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -16,7 +16,9 @@ import 'package:protobuf/protobuf.dart' as $pb;
 /// WellKnownRegex contain some well-known patterns.
 class KnownRegex extends $pb.ProtobufEnum {
   static const KnownRegex UNKNOWN = KnownRegex._(0, _omitEnumNames ? '' : 'UNKNOWN');
+  /// HTTP header name as defined by RFC 7230.
   static const KnownRegex HTTP_HEADER_NAME = KnownRegex._(1, _omitEnumNames ? '' : 'HTTP_HEADER_NAME');
+  /// HTTP header value as defined by RFC 7230.
   static const KnownRegex HTTP_HEADER_VALUE = KnownRegex._(2, _omitEnumNames ? '' : 'HTTP_HEADER_VALUE');
 
   static const $core.List<KnownRegex> values = <KnownRegex> [
@@ -28,7 +30,7 @@ class KnownRegex extends $pb.ProtobufEnum {
   static final $core.Map<$core.int, KnownRegex> _byValue = $pb.ProtobufEnum.initByValue(values);
   static KnownRegex? valueOf($core.int value) => _byValue[value];
 
-  const KnownRegex._($core.int v, $core.String n) : super(v, n);
+  const KnownRegex._(super.v, super.n);
 }
 
 
diff --git a/lib/validate.pbjson.dart b/lib/validate.pbjson.dart
index b9e64b5..543fa9f 100644
--- a/lib/validate.pbjson.dart
+++ b/lib/validate.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: validate.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/visibility.pb.dart b/lib/visibility.pb.dart
index 40a525f..2de52e8 100644
--- a/lib/visibility.pb.dart
+++ b/lib/visibility.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: visibility.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -13,6 +13,8 @@ import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 ///  `Visibility` defines restrictions for the visibility of service
 ///  elements.  Restrictions are specified using visibility labels
 ///  (e.g., PREVIEW) that are elsewhere linked to users and projects.
@@ -79,7 +81,7 @@ class Visibility extends $pb.GeneratedMessage {
   ///
   ///  **NOTE:** All service configuration rules follow "last one wins" order.
   @$pb.TagNumber(1)
-  $core.List<VisibilityRule> get rules => $_getList(0);
+  $pb.PbList<VisibilityRule> get rules => $_getList(0);
 }
 
 /// A visibility rule provides visibility configuration for an individual API
@@ -139,7 +141,7 @@ class VisibilityRule extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasSelector() => $_has(0);
   @$pb.TagNumber(1)
-  void clearSelector() => clearField(1);
+  void clearSelector() => $_clearField(1);
 
   ///  A comma-separated list of visibility labels that apply to the `selector`.
   ///  Any of the listed labels can be used to grant the visibility.
@@ -163,7 +165,7 @@ class VisibilityRule extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasRestriction() => $_has(1);
   @$pb.TagNumber(2)
-  void clearRestriction() => clearField(2);
+  void clearRestriction() => $_clearField(2);
 }
 
 class VisibilityExt {
diff --git a/lib/visibility.pbenum.dart b/lib/visibility.pbenum.dart
index d0c7a7f..8403cb6 100644
--- a/lib/visibility.pbenum.dart
+++ b/lib/visibility.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: visibility.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/visibility.pbjson.dart b/lib/visibility.pbjson.dart
index aa606dd..cf56095 100644
--- a/lib/visibility.pbjson.dart
+++ b/lib/visibility.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: visibility.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/viz-common.pb.dart b/lib/viz-common.pb.dart
index 115aa18..1975643 100644
--- a/lib/viz-common.pb.dart
+++ b/lib/viz-common.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-common.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -11,3 +11,5 @@
 
 import 'dart:core' as $core;
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
diff --git a/lib/viz-common.pbenum.dart b/lib/viz-common.pbenum.dart
index cfba9c8..85ec5ab 100644
--- a/lib/viz-common.pbenum.dart
+++ b/lib/viz-common.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-common.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/viz-common.pbjson.dart b/lib/viz-common.pbjson.dart
index 131a2b0..222add8 100644
--- a/lib/viz-common.pbjson.dart
+++ b/lib/viz-common.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-common.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/viz-composed-field.pb.dart b/lib/viz-composed-field.pb.dart
index 229825b..9526d2a 100644
--- a/lib/viz-composed-field.pb.dart
+++ b/lib/viz-composed-field.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-composed-field.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -15,6 +15,8 @@ import 'package:protobuf/protobuf.dart' as $pb;
 
 import 'core/shared.pb.dart' as $16;
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 class ComposedField extends $pb.GeneratedMessage {
   factory ComposedField({
     $core.String? composedFieldID,
@@ -108,7 +110,7 @@ class ComposedField extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasComposedFieldID() => $_has(0);
   @$pb.TagNumber(1)
-  void clearComposedFieldID() => clearField(1);
+  void clearComposedFieldID() => $_clearField(1);
 
   /// Name of the Composed Field
   @$pb.TagNumber(2)
@@ -118,7 +120,7 @@ class ComposedField extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasName() => $_has(1);
   @$pb.TagNumber(2)
-  void clearName() => clearField(2);
+  void clearName() => $_clearField(2);
 
   /// Identifier of the project
   @$pb.TagNumber(3)
@@ -128,7 +130,7 @@ class ComposedField extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasProjectID() => $_has(2);
   @$pb.TagNumber(3)
-  void clearProjectID() => clearField(3);
+  void clearProjectID() => $_clearField(3);
 
   /// Identifier of the Screen
   @$pb.TagNumber(4)
@@ -138,7 +140,7 @@ class ComposedField extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasScreenID() => $_has(3);
   @$pb.TagNumber(4)
-  void clearScreenID() => clearField(4);
+  void clearScreenID() => $_clearField(4);
 
   /// Identifier of the user who created
   @$pb.TagNumber(5)
@@ -148,7 +150,7 @@ class ComposedField extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $core.bool hasCreateUserID() => $_has(4);
   @$pb.TagNumber(5)
-  void clearCreateUserID() => clearField(5);
+  void clearCreateUserID() => $_clearField(5);
 
   /// Identifier of the user who did the last update
   @$pb.TagNumber(6)
@@ -158,7 +160,7 @@ class ComposedField extends $pb.GeneratedMessage {
   @$pb.TagNumber(6)
   $core.bool hasUpdateUserID() => $_has(5);
   @$pb.TagNumber(6)
-  void clearUpdateUserID() => clearField(6);
+  void clearUpdateUserID() => $_clearField(6);
 
   /// Date of creation in ISO 8601 format with time zone (accepted tzd formats: [+01:00, -01:00, Z]
   @$pb.TagNumber(7)
@@ -168,7 +170,7 @@ class ComposedField extends $pb.GeneratedMessage {
   @$pb.TagNumber(7)
   $core.bool hasCreateDateTime() => $_has(6);
   @$pb.TagNumber(7)
-  void clearCreateDateTime() => clearField(7);
+  void clearCreateDateTime() => $_clearField(7);
 
   /// Date of last update in ISO 8601 format with time zone (accepted tzd formats: [+01:00, -01:00, Z]
   @$pb.TagNumber(8)
@@ -178,7 +180,7 @@ class ComposedField extends $pb.GeneratedMessage {
   @$pb.TagNumber(8)
   $core.bool hasUpdateDateTime() => $_has(7);
   @$pb.TagNumber(8)
-  void clearUpdateDateTime() => clearField(8);
+  void clearUpdateDateTime() => $_clearField(8);
 
   /// Identifier of the Tab
   @$pb.TagNumber(9)
@@ -188,7 +190,7 @@ class ComposedField extends $pb.GeneratedMessage {
   @$pb.TagNumber(9)
   $core.bool hasTabID() => $_has(8);
   @$pb.TagNumber(9)
-  void clearTabID() => clearField(9);
+  void clearTabID() => $_clearField(9);
 
   /// Content in the Composed Field
   @$pb.TagNumber(10)
@@ -198,7 +200,7 @@ class ComposedField extends $pb.GeneratedMessage {
   @$pb.TagNumber(10)
   $core.bool hasPayload() => $_has(9);
   @$pb.TagNumber(10)
-  void clearPayload() => clearField(10);
+  void clearPayload() => $_clearField(10);
 }
 
 /// IDs of the Composed Field
@@ -250,11 +252,11 @@ class GetComposedFieldRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $16.RequestProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($16.RequestProjectHeader v) { setField(1, v); }
+  set header($16.RequestProjectHeader v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
-  void clearHeader() => clearField(1);
+  void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
   $16.RequestProjectHeader ensureHeader() => $_ensure(0);
 
@@ -266,7 +268,7 @@ class GetComposedFieldRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasComposedFieldID() => $_has(1);
   @$pb.TagNumber(2)
-  void clearComposedFieldID() => clearField(2);
+  void clearComposedFieldID() => $_clearField(2);
 }
 
 /// All the Content about the composed field
@@ -313,11 +315,11 @@ class GetComposedFieldResult extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   ComposedField get result => $_getN(0);
   @$pb.TagNumber(1)
-  set result(ComposedField v) { setField(1, v); }
+  set result(ComposedField v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasResult() => $_has(0);
   @$pb.TagNumber(1)
-  void clearResult() => clearField(1);
+  void clearResult() => $_clearField(1);
   @$pb.TagNumber(1)
   ComposedField ensureResult() => $_ensure(0);
 }
@@ -386,11 +388,11 @@ class CreateComposedFieldRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $16.RequestProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($16.RequestProjectHeader v) { setField(1, v); }
+  set header($16.RequestProjectHeader v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
-  void clearHeader() => clearField(1);
+  void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
   $16.RequestProjectHeader ensureHeader() => $_ensure(0);
 
@@ -402,7 +404,7 @@ class CreateComposedFieldRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasName() => $_has(1);
   @$pb.TagNumber(2)
-  void clearName() => clearField(2);
+  void clearName() => $_clearField(2);
 
   /// Identifier of the Screen
   @$pb.TagNumber(3)
@@ -412,7 +414,7 @@ class CreateComposedFieldRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasScreenID() => $_has(2);
   @$pb.TagNumber(3)
-  void clearScreenID() => clearField(3);
+  void clearScreenID() => $_clearField(3);
 
   /// Identifier of the Tab
   @$pb.TagNumber(4)
@@ -422,7 +424,7 @@ class CreateComposedFieldRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasTabID() => $_has(3);
   @$pb.TagNumber(4)
-  void clearTabID() => clearField(4);
+  void clearTabID() => $_clearField(4);
 
   /// Content in the Composed Field
   @$pb.TagNumber(5)
@@ -432,7 +434,7 @@ class CreateComposedFieldRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $core.bool hasPayload() => $_has(4);
   @$pb.TagNumber(5)
-  void clearPayload() => clearField(5);
+  void clearPayload() => $_clearField(5);
 }
 
 /// ID of the created Composed Field
@@ -484,7 +486,7 @@ class CreateComposedFieldResult extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasComposedFieldID() => $_has(0);
   @$pb.TagNumber(1)
-  void clearComposedFieldID() => clearField(1);
+  void clearComposedFieldID() => $_clearField(1);
 }
 
 /// Content that needs to be updated
@@ -556,11 +558,11 @@ class UpdateComposedFieldRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $16.RequestProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($16.RequestProjectHeader v) { setField(1, v); }
+  set header($16.RequestProjectHeader v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
-  void clearHeader() => clearField(1);
+  void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
   $16.RequestProjectHeader ensureHeader() => $_ensure(0);
 
@@ -572,7 +574,7 @@ class UpdateComposedFieldRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasComposedFieldID() => $_has(1);
   @$pb.TagNumber(2)
-  void clearComposedFieldID() => clearField(2);
+  void clearComposedFieldID() => $_clearField(2);
 
   /// Name of the Composed Field
   @$pb.TagNumber(3)
@@ -582,7 +584,7 @@ class UpdateComposedFieldRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasName() => $_has(2);
   @$pb.TagNumber(3)
-  void clearName() => clearField(3);
+  void clearName() => $_clearField(3);
 
   /// Identifier of the Screen
   @$pb.TagNumber(4)
@@ -592,7 +594,7 @@ class UpdateComposedFieldRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasScreenID() => $_has(3);
   @$pb.TagNumber(4)
-  void clearScreenID() => clearField(4);
+  void clearScreenID() => $_clearField(4);
 
   /// Identifier of the Tab
   @$pb.TagNumber(5)
@@ -602,7 +604,7 @@ class UpdateComposedFieldRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $core.bool hasTabID() => $_has(4);
   @$pb.TagNumber(5)
-  void clearTabID() => clearField(5);
+  void clearTabID() => $_clearField(5);
 
   /// Content in the Composed Field
   @$pb.TagNumber(6)
@@ -612,7 +614,7 @@ class UpdateComposedFieldRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(6)
   $core.bool hasPayload() => $_has(5);
   @$pb.TagNumber(6)
-  void clearPayload() => clearField(6);
+  void clearPayload() => $_clearField(6);
 }
 
 /// Updated dashboard ID
@@ -664,7 +666,7 @@ class UpdateComposedFieldResult extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasComposedFieldID() => $_has(0);
   @$pb.TagNumber(1)
-  void clearComposedFieldID() => clearField(1);
+  void clearComposedFieldID() => $_clearField(1);
 }
 
 /// IDs of the Composed Field to be deleted
@@ -716,11 +718,11 @@ class DeleteComposedFieldRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $16.RequestProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($16.RequestProjectHeader v) { setField(1, v); }
+  set header($16.RequestProjectHeader v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
-  void clearHeader() => clearField(1);
+  void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
   $16.RequestProjectHeader ensureHeader() => $_ensure(0);
 
@@ -732,7 +734,7 @@ class DeleteComposedFieldRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasComposedFieldID() => $_has(1);
   @$pb.TagNumber(2)
-  void clearComposedFieldID() => clearField(2);
+  void clearComposedFieldID() => $_clearField(2);
 }
 
 class DeleteComposedFieldResult extends $pb.GeneratedMessage {
@@ -820,11 +822,11 @@ class ListComposedFieldRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $16.RequestProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($16.RequestProjectHeader v) { setField(1, v); }
+  set header($16.RequestProjectHeader v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
-  void clearHeader() => clearField(1);
+  void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
   $16.RequestProjectHeader ensureHeader() => $_ensure(0);
 
@@ -836,7 +838,7 @@ class ListComposedFieldRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasScreenID() => $_has(1);
   @$pb.TagNumber(2)
-  void clearScreenID() => clearField(2);
+  void clearScreenID() => $_clearField(2);
 
   /// Identifier of the Tab
   @$pb.TagNumber(3)
@@ -846,7 +848,7 @@ class ListComposedFieldRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasTabID() => $_has(2);
   @$pb.TagNumber(3)
-  void clearTabID() => clearField(3);
+  void clearTabID() => $_clearField(3);
 }
 
 /// List of Composed Fields
@@ -892,7 +894,7 @@ class ListComposedFieldResult extends $pb.GeneratedMessage {
 
   /// All Content in a Composed Field
   @$pb.TagNumber(1)
-  $core.List<ComposedField> get results => $_getList(0);
+  $pb.PbList<ComposedField> get results => $_getList(0);
 }
 
 
diff --git a/lib/viz-composed-field.pbenum.dart b/lib/viz-composed-field.pbenum.dart
index 85aee86..7f934c3 100644
--- a/lib/viz-composed-field.pbenum.dart
+++ b/lib/viz-composed-field.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-composed-field.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/viz-composed-field.pbgrpc.dart b/lib/viz-composed-field.pbgrpc.dart
index 473d1fe..50c6d0a 100644
--- a/lib/viz-composed-field.pbgrpc.dart
+++ b/lib/viz-composed-field.pbgrpc.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-composed-field.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -111,24 +111,24 @@ abstract class ComposedFieldServiceBase extends $grpc.Service {
         ($2.ListComposedFieldResult value) => value.writeToBuffer()));
   }
 
-  $async.Future<$2.GetComposedFieldResult> get_Pre($grpc.ServiceCall call, $async.Future<$2.GetComposedFieldRequest> request) async {
-    return get(call, await request);
+  $async.Future<$2.GetComposedFieldResult> get_Pre($grpc.ServiceCall $call, $async.Future<$2.GetComposedFieldRequest> $request) async {
+    return get($call, await $request);
   }
 
-  $async.Future<$2.CreateComposedFieldResult> create_Pre($grpc.ServiceCall call, $async.Future<$2.CreateComposedFieldRequest> request) async {
-    return create(call, await request);
+  $async.Future<$2.CreateComposedFieldResult> create_Pre($grpc.ServiceCall $call, $async.Future<$2.CreateComposedFieldRequest> $request) async {
+    return create($call, await $request);
   }
 
-  $async.Future<$2.UpdateComposedFieldResult> update_Pre($grpc.ServiceCall call, $async.Future<$2.UpdateComposedFieldRequest> request) async {
-    return update(call, await request);
+  $async.Future<$2.UpdateComposedFieldResult> update_Pre($grpc.ServiceCall $call, $async.Future<$2.UpdateComposedFieldRequest> $request) async {
+    return update($call, await $request);
   }
 
-  $async.Future<$2.DeleteComposedFieldResult> delete_Pre($grpc.ServiceCall call, $async.Future<$2.DeleteComposedFieldRequest> request) async {
-    return delete(call, await request);
+  $async.Future<$2.DeleteComposedFieldResult> delete_Pre($grpc.ServiceCall $call, $async.Future<$2.DeleteComposedFieldRequest> $request) async {
+    return delete($call, await $request);
   }
 
-  $async.Future<$2.ListComposedFieldResult> list_Pre($grpc.ServiceCall call, $async.Future<$2.ListComposedFieldRequest> request) async {
-    return list(call, await request);
+  $async.Future<$2.ListComposedFieldResult> list_Pre($grpc.ServiceCall $call, $async.Future<$2.ListComposedFieldRequest> $request) async {
+    return list($call, await $request);
   }
 
   $async.Future<$2.GetComposedFieldResult> get($grpc.ServiceCall call, $2.GetComposedFieldRequest request);
diff --git a/lib/viz-composed-field.pbjson.dart b/lib/viz-composed-field.pbjson.dart
index f9815df..419e68b 100644
--- a/lib/viz-composed-field.pbjson.dart
+++ b/lib/viz-composed-field.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-composed-field.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/viz-dashboard.pb.dart b/lib/viz-dashboard.pb.dart
index ae5c24b..222cd00 100644
--- a/lib/viz-dashboard.pb.dart
+++ b/lib/viz-dashboard.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-dashboard.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -15,6 +15,8 @@ import 'package:protobuf/protobuf.dart' as $pb;
 
 import 'core/shared.pb.dart' as $16;
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 class Dashboard extends $pb.GeneratedMessage {
   factory Dashboard({
     $core.String? dashboardID,
@@ -103,7 +105,7 @@ class Dashboard extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasDashboardID() => $_has(0);
   @$pb.TagNumber(1)
-  void clearDashboardID() => clearField(1);
+  void clearDashboardID() => $_clearField(1);
 
   /// Name of the Dashboard
   @$pb.TagNumber(2)
@@ -113,7 +115,7 @@ class Dashboard extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasName() => $_has(1);
   @$pb.TagNumber(2)
-  void clearName() => clearField(2);
+  void clearName() => $_clearField(2);
 
   /// All the widgets in Dashboard
   @$pb.TagNumber(3)
@@ -123,7 +125,7 @@ class Dashboard extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasContent() => $_has(2);
   @$pb.TagNumber(3)
-  void clearContent() => clearField(3);
+  void clearContent() => $_clearField(3);
 
   /// Identifier of the user who created
   @$pb.TagNumber(4)
@@ -133,7 +135,7 @@ class Dashboard extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasCreateUserID() => $_has(3);
   @$pb.TagNumber(4)
-  void clearCreateUserID() => clearField(4);
+  void clearCreateUserID() => $_clearField(4);
 
   /// Identifier of the user who did the last update
   @$pb.TagNumber(5)
@@ -143,7 +145,7 @@ class Dashboard extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $core.bool hasUpdateUserID() => $_has(4);
   @$pb.TagNumber(5)
-  void clearUpdateUserID() => clearField(5);
+  void clearUpdateUserID() => $_clearField(5);
 
   /// Date of creation in ISO 8601 format with time zone (accepted tzd formats: [+01:00, -01:00, Z]
   @$pb.TagNumber(6)
@@ -153,7 +155,7 @@ class Dashboard extends $pb.GeneratedMessage {
   @$pb.TagNumber(6)
   $core.bool hasCreateDate() => $_has(5);
   @$pb.TagNumber(6)
-  void clearCreateDate() => clearField(6);
+  void clearCreateDate() => $_clearField(6);
 
   /// Date of last update in ISO 8601 format with time zone (accepted tzd formats: [+01:00, -01:00, Z]
   @$pb.TagNumber(7)
@@ -163,7 +165,7 @@ class Dashboard extends $pb.GeneratedMessage {
   @$pb.TagNumber(7)
   $core.bool hasUpdateDate() => $_has(6);
   @$pb.TagNumber(7)
-  void clearUpdateDate() => clearField(7);
+  void clearUpdateDate() => $_clearField(7);
 
   /// Visibility of the Dashboard
   @$pb.TagNumber(8)
@@ -173,7 +175,7 @@ class Dashboard extends $pb.GeneratedMessage {
   @$pb.TagNumber(8)
   $core.bool hasIsPrivate() => $_has(7);
   @$pb.TagNumber(8)
-  void clearIsPrivate() => clearField(8);
+  void clearIsPrivate() => $_clearField(8);
 
   @$pb.TagNumber(12)
   $core.int get autoRefresh => $_getIZ(8);
@@ -182,7 +184,7 @@ class Dashboard extends $pb.GeneratedMessage {
   @$pb.TagNumber(12)
   $core.bool hasAutoRefresh() => $_has(8);
   @$pb.TagNumber(12)
-  void clearAutoRefresh() => clearField(12);
+  void clearAutoRefresh() => $_clearField(12);
 }
 
 class ListDashboardRequest extends $pb.GeneratedMessage {
@@ -228,11 +230,11 @@ class ListDashboardRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $16.RequestProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($16.RequestProjectHeader v) { setField(1, v); }
+  set header($16.RequestProjectHeader v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
-  void clearHeader() => clearField(1);
+  void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
   $16.RequestProjectHeader ensureHeader() => $_ensure(0);
 }
@@ -280,7 +282,7 @@ class ListDashboardResult extends $pb.GeneratedMessage {
 
   /// All information in a Dashboard
   @$pb.TagNumber(1)
-  $core.List<Dashboard> get results => $_getList(0);
+  $pb.PbList<Dashboard> get results => $_getList(0);
 }
 
 /// Information that needs to be stored
@@ -347,11 +349,11 @@ class CreateDashboardRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $16.RequestProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($16.RequestProjectHeader v) { setField(1, v); }
+  set header($16.RequestProjectHeader v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
-  void clearHeader() => clearField(1);
+  void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
   $16.RequestProjectHeader ensureHeader() => $_ensure(0);
 
@@ -363,7 +365,7 @@ class CreateDashboardRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasName() => $_has(1);
   @$pb.TagNumber(2)
-  void clearName() => clearField(2);
+  void clearName() => $_clearField(2);
 
   /// All widgets in Dashboard
   @$pb.TagNumber(3)
@@ -373,7 +375,7 @@ class CreateDashboardRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasContent() => $_has(2);
   @$pb.TagNumber(3)
-  void clearContent() => clearField(3);
+  void clearContent() => $_clearField(3);
 
   /// Visibility of the Dashboard
   @$pb.TagNumber(4)
@@ -383,7 +385,7 @@ class CreateDashboardRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasIsPrivate() => $_has(3);
   @$pb.TagNumber(4)
-  void clearIsPrivate() => clearField(4);
+  void clearIsPrivate() => $_clearField(4);
 
   @$pb.TagNumber(8)
   $core.int get autoRefresh => $_getIZ(4);
@@ -392,7 +394,7 @@ class CreateDashboardRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(8)
   $core.bool hasAutoRefresh() => $_has(4);
   @$pb.TagNumber(8)
-  void clearAutoRefresh() => clearField(8);
+  void clearAutoRefresh() => $_clearField(8);
 }
 
 /// Created Dashboard
@@ -439,11 +441,11 @@ class CreateDashboardResult extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   Dashboard get result => $_getN(0);
   @$pb.TagNumber(1)
-  set result(Dashboard v) { setField(1, v); }
+  set result(Dashboard v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasResult() => $_has(0);
   @$pb.TagNumber(1)
-  void clearResult() => clearField(1);
+  void clearResult() => $_clearField(1);
   @$pb.TagNumber(1)
   Dashboard ensureResult() => $_ensure(0);
 }
@@ -497,11 +499,11 @@ class DeleteDashboardRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $16.RequestProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($16.RequestProjectHeader v) { setField(1, v); }
+  set header($16.RequestProjectHeader v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
-  void clearHeader() => clearField(1);
+  void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
   $16.RequestProjectHeader ensureHeader() => $_ensure(0);
 
@@ -513,7 +515,7 @@ class DeleteDashboardRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasDashboardID() => $_has(1);
   @$pb.TagNumber(2)
-  void clearDashboardID() => clearField(2);
+  void clearDashboardID() => $_clearField(2);
 }
 
 class DeleteDashboardResult extends $pb.GeneratedMessage {
@@ -597,7 +599,7 @@ class DeleteDashboardsForOrganisationRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasOrganisationID() => $_has(0);
   @$pb.TagNumber(2)
-  void clearOrganisationID() => clearField(2);
+  void clearOrganisationID() => $_clearField(2);
 }
 
 class DeleteDashboardsForOrganisationResult extends $pb.GeneratedMessage {
@@ -681,7 +683,7 @@ class DeleteDashboardsForProjectRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasProjectID() => $_has(0);
   @$pb.TagNumber(1)
-  void clearProjectID() => clearField(1);
+  void clearProjectID() => $_clearField(1);
 }
 
 class DeleteDashboardsForProjectResult extends $pb.GeneratedMessage {
@@ -785,11 +787,11 @@ class UpdateDashboardRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $16.RequestProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($16.RequestProjectHeader v) { setField(1, v); }
+  set header($16.RequestProjectHeader v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
-  void clearHeader() => clearField(1);
+  void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
   $16.RequestProjectHeader ensureHeader() => $_ensure(0);
 
@@ -801,17 +803,17 @@ class UpdateDashboardRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasDashboardID() => $_has(1);
   @$pb.TagNumber(2)
-  void clearDashboardID() => clearField(2);
+  void clearDashboardID() => $_clearField(2);
 
   /// Name of the Dashboard
   @$pb.TagNumber(3)
   $16.StringObject get name => $_getN(2);
   @$pb.TagNumber(3)
-  set name($16.StringObject v) { setField(3, v); }
+  set name($16.StringObject v) { $_setField(3, v); }
   @$pb.TagNumber(3)
   $core.bool hasName() => $_has(2);
   @$pb.TagNumber(3)
-  void clearName() => clearField(3);
+  void clearName() => $_clearField(3);
   @$pb.TagNumber(3)
   $16.StringObject ensureName() => $_ensure(2);
 
@@ -819,11 +821,11 @@ class UpdateDashboardRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $16.StringObject get content => $_getN(3);
   @$pb.TagNumber(4)
-  set content($16.StringObject v) { setField(4, v); }
+  set content($16.StringObject v) { $_setField(4, v); }
   @$pb.TagNumber(4)
   $core.bool hasContent() => $_has(3);
   @$pb.TagNumber(4)
-  void clearContent() => clearField(4);
+  void clearContent() => $_clearField(4);
   @$pb.TagNumber(4)
   $16.StringObject ensureContent() => $_ensure(3);
 
@@ -831,22 +833,22 @@ class UpdateDashboardRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $16.BoolObject get isPrivate => $_getN(4);
   @$pb.TagNumber(5)
-  set isPrivate($16.BoolObject v) { setField(5, v); }
+  set isPrivate($16.BoolObject v) { $_setField(5, v); }
   @$pb.TagNumber(5)
   $core.bool hasIsPrivate() => $_has(4);
   @$pb.TagNumber(5)
-  void clearIsPrivate() => clearField(5);
+  void clearIsPrivate() => $_clearField(5);
   @$pb.TagNumber(5)
   $16.BoolObject ensureIsPrivate() => $_ensure(4);
 
   @$pb.TagNumber(9)
   $16.Int32Object get autoRefresh => $_getN(5);
   @$pb.TagNumber(9)
-  set autoRefresh($16.Int32Object v) { setField(9, v); }
+  set autoRefresh($16.Int32Object v) { $_setField(9, v); }
   @$pb.TagNumber(9)
   $core.bool hasAutoRefresh() => $_has(5);
   @$pb.TagNumber(9)
-  void clearAutoRefresh() => clearField(9);
+  void clearAutoRefresh() => $_clearField(9);
   @$pb.TagNumber(9)
   $16.Int32Object ensureAutoRefresh() => $_ensure(5);
 }
@@ -895,11 +897,11 @@ class UpdateDashboardResult extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   Dashboard get result => $_getN(0);
   @$pb.TagNumber(1)
-  set result(Dashboard v) { setField(1, v); }
+  set result(Dashboard v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasResult() => $_has(0);
   @$pb.TagNumber(1)
-  void clearResult() => clearField(1);
+  void clearResult() => $_clearField(1);
   @$pb.TagNumber(1)
   Dashboard ensureResult() => $_ensure(0);
 }
@@ -953,11 +955,11 @@ class GetDashboardRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $16.RequestProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($16.RequestProjectHeader v) { setField(1, v); }
+  set header($16.RequestProjectHeader v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
-  void clearHeader() => clearField(1);
+  void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
   $16.RequestProjectHeader ensureHeader() => $_ensure(0);
 
@@ -969,7 +971,7 @@ class GetDashboardRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasDashboardID() => $_has(1);
   @$pb.TagNumber(2)
-  void clearDashboardID() => clearField(2);
+  void clearDashboardID() => $_clearField(2);
 }
 
 /// All information about the Dashboard
@@ -1016,11 +1018,11 @@ class GetDashboardResult extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   Dashboard get result => $_getN(0);
   @$pb.TagNumber(1)
-  set result(Dashboard v) { setField(1, v); }
+  set result(Dashboard v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasResult() => $_has(0);
   @$pb.TagNumber(1)
-  void clearResult() => clearField(1);
+  void clearResult() => $_clearField(1);
   @$pb.TagNumber(1)
   Dashboard ensureResult() => $_ensure(0);
 }
@@ -1078,11 +1080,11 @@ class CopyDashboardRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $16.RequestProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($16.RequestProjectHeader v) { setField(1, v); }
+  set header($16.RequestProjectHeader v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
-  void clearHeader() => clearField(1);
+  void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
   $16.RequestProjectHeader ensureHeader() => $_ensure(0);
 
@@ -1094,7 +1096,7 @@ class CopyDashboardRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasDashboardID() => $_has(1);
   @$pb.TagNumber(2)
-  void clearDashboardID() => clearField(2);
+  void clearDashboardID() => $_clearField(2);
 
   /// Name of the new Dashboard
   @$pb.TagNumber(3)
@@ -1104,7 +1106,7 @@ class CopyDashboardRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasName() => $_has(2);
   @$pb.TagNumber(3)
-  void clearName() => clearField(3);
+  void clearName() => $_clearField(3);
 }
 
 /// New copied dashboard
@@ -1151,11 +1153,11 @@ class CopyDashboardResult extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   Dashboard get result => $_getN(0);
   @$pb.TagNumber(1)
-  set result(Dashboard v) { setField(1, v); }
+  set result(Dashboard v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasResult() => $_has(0);
   @$pb.TagNumber(1)
-  void clearResult() => clearField(1);
+  void clearResult() => $_clearField(1);
   @$pb.TagNumber(1)
   Dashboard ensureResult() => $_ensure(0);
 }
diff --git a/lib/viz-dashboard.pbenum.dart b/lib/viz-dashboard.pbenum.dart
index 68aabc5..0c7da12 100644
--- a/lib/viz-dashboard.pbenum.dart
+++ b/lib/viz-dashboard.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-dashboard.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/viz-dashboard.pbgrpc.dart b/lib/viz-dashboard.pbgrpc.dart
index c49aa22..6c24430 100644
--- a/lib/viz-dashboard.pbgrpc.dart
+++ b/lib/viz-dashboard.pbgrpc.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-dashboard.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -156,36 +156,36 @@ abstract class DashboardServiceBase extends $grpc.Service {
         ($6.CopyDashboardResult value) => value.writeToBuffer()));
   }
 
-  $async.Future<$6.CreateDashboardResult> create_Pre($grpc.ServiceCall call, $async.Future<$6.CreateDashboardRequest> request) async {
-    return create(call, await request);
+  $async.Future<$6.CreateDashboardResult> create_Pre($grpc.ServiceCall $call, $async.Future<$6.CreateDashboardRequest> $request) async {
+    return create($call, await $request);
   }
 
-  $async.Future<$6.ListDashboardResult> list_Pre($grpc.ServiceCall call, $async.Future<$6.ListDashboardRequest> request) async {
-    return list(call, await request);
+  $async.Future<$6.ListDashboardResult> list_Pre($grpc.ServiceCall $call, $async.Future<$6.ListDashboardRequest> $request) async {
+    return list($call, await $request);
   }
 
-  $async.Future<$6.DeleteDashboardResult> delete_Pre($grpc.ServiceCall call, $async.Future<$6.DeleteDashboardRequest> request) async {
-    return delete(call, await request);
+  $async.Future<$6.DeleteDashboardResult> delete_Pre($grpc.ServiceCall $call, $async.Future<$6.DeleteDashboardRequest> $request) async {
+    return delete($call, await $request);
   }
 
-  $async.Future<$6.DeleteDashboardsForOrganisationResult> deleteDashboardsForOrganisation_Pre($grpc.ServiceCall call, $async.Future<$6.DeleteDashboardsForOrganisationRequest> request) async {
-    return deleteDashboardsForOrganisation(call, await request);
+  $async.Future<$6.DeleteDashboardsForOrganisationResult> deleteDashboardsForOrganisation_Pre($grpc.ServiceCall $call, $async.Future<$6.DeleteDashboardsForOrganisationRequest> $request) async {
+    return deleteDashboardsForOrganisation($call, await $request);
   }
 
-  $async.Future<$6.DeleteDashboardsForProjectResult> deleteDashboardsForProject_Pre($grpc.ServiceCall call, $async.Future<$6.DeleteDashboardsForProjectRequest> request) async {
-    return deleteDashboardsForProject(call, await request);
+  $async.Future<$6.DeleteDashboardsForProjectResult> deleteDashboardsForProject_Pre($grpc.ServiceCall $call, $async.Future<$6.DeleteDashboardsForProjectRequest> $request) async {
+    return deleteDashboardsForProject($call, await $request);
   }
 
-  $async.Future<$6.UpdateDashboardResult> update_Pre($grpc.ServiceCall call, $async.Future<$6.UpdateDashboardRequest> request) async {
-    return update(call, await request);
+  $async.Future<$6.UpdateDashboardResult> update_Pre($grpc.ServiceCall $call, $async.Future<$6.UpdateDashboardRequest> $request) async {
+    return update($call, await $request);
   }
 
-  $async.Future<$6.GetDashboardResult> get_Pre($grpc.ServiceCall call, $async.Future<$6.GetDashboardRequest> request) async {
-    return get(call, await request);
+  $async.Future<$6.GetDashboardResult> get_Pre($grpc.ServiceCall $call, $async.Future<$6.GetDashboardRequest> $request) async {
+    return get($call, await $request);
   }
 
-  $async.Future<$6.CopyDashboardResult> copy_Pre($grpc.ServiceCall call, $async.Future<$6.CopyDashboardRequest> request) async {
-    return copy(call, await request);
+  $async.Future<$6.CopyDashboardResult> copy_Pre($grpc.ServiceCall $call, $async.Future<$6.CopyDashboardRequest> $request) async {
+    return copy($call, await $request);
   }
 
   $async.Future<$6.CreateDashboardResult> create($grpc.ServiceCall call, $6.CreateDashboardRequest request);
diff --git a/lib/viz-dashboard.pbjson.dart b/lib/viz-dashboard.pbjson.dart
index bc72bef..d12e4d8 100644
--- a/lib/viz-dashboard.pbjson.dart
+++ b/lib/viz-dashboard.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-dashboard.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/viz-default-view.pb.dart b/lib/viz-default-view.pb.dart
index 7460cfe..ce637a2 100644
--- a/lib/viz-default-view.pb.dart
+++ b/lib/viz-default-view.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-default-view.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -13,6 +13,8 @@ import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 class UpdatePlatformDefaultViewRequest extends $pb.GeneratedMessage {
   factory UpdatePlatformDefaultViewRequest({
     $core.String? viewID,
@@ -71,7 +73,7 @@ class UpdatePlatformDefaultViewRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasViewID() => $_has(0);
   @$pb.TagNumber(1)
-  void clearViewID() => clearField(1);
+  void clearViewID() => $_clearField(1);
 
   /// Content of the View
   @$pb.TagNumber(4)
@@ -81,7 +83,7 @@ class UpdatePlatformDefaultViewRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasPayload() => $_has(1);
   @$pb.TagNumber(4)
-  void clearPayload() => clearField(4);
+  void clearPayload() => $_clearField(4);
 
   /// Visibility of the View
   @$pb.TagNumber(5)
@@ -91,7 +93,7 @@ class UpdatePlatformDefaultViewRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $core.bool hasIsPrivate() => $_has(2);
   @$pb.TagNumber(5)
-  void clearIsPrivate() => clearField(5);
+  void clearIsPrivate() => $_clearField(5);
 }
 
 class CreatePlatformDefaultViewRequest extends $pb.GeneratedMessage {
@@ -152,7 +154,7 @@ class CreatePlatformDefaultViewRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasScreenID() => $_has(0);
   @$pb.TagNumber(1)
-  void clearScreenID() => clearField(1);
+  void clearScreenID() => $_clearField(1);
 
   /// Content of the View
   @$pb.TagNumber(4)
@@ -162,7 +164,7 @@ class CreatePlatformDefaultViewRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasPayload() => $_has(1);
   @$pb.TagNumber(4)
-  void clearPayload() => clearField(4);
+  void clearPayload() => $_clearField(4);
 
   /// Visibility of the View
   @$pb.TagNumber(5)
@@ -172,7 +174,7 @@ class CreatePlatformDefaultViewRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $core.bool hasIsPrivate() => $_has(2);
   @$pb.TagNumber(5)
-  void clearIsPrivate() => clearField(5);
+  void clearIsPrivate() => $_clearField(5);
 }
 
 /// ID of the created View
@@ -224,7 +226,7 @@ class CreatePlatformDefaultViewResult extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasViewID() => $_has(0);
   @$pb.TagNumber(1)
-  void clearViewID() => clearField(1);
+  void clearViewID() => $_clearField(1);
 }
 
 class UpdatePlatformDefaultViewResult extends $pb.GeneratedMessage {
@@ -275,7 +277,7 @@ class UpdatePlatformDefaultViewResult extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasViewID() => $_has(0);
   @$pb.TagNumber(1)
-  void clearViewID() => clearField(1);
+  void clearViewID() => $_clearField(1);
 }
 
 
diff --git a/lib/viz-default-view.pbenum.dart b/lib/viz-default-view.pbenum.dart
index 816f95e..f0d3e09 100644
--- a/lib/viz-default-view.pbenum.dart
+++ b/lib/viz-default-view.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-default-view.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/viz-default-view.pbgrpc.dart b/lib/viz-default-view.pbgrpc.dart
index a8cf483..9218a92 100644
--- a/lib/viz-default-view.pbgrpc.dart
+++ b/lib/viz-default-view.pbgrpc.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-default-view.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -66,12 +66,12 @@ abstract class DefaultViewServiceBase extends $grpc.Service {
         ($3.UpdatePlatformDefaultViewResult value) => value.writeToBuffer()));
   }
 
-  $async.Future<$3.CreatePlatformDefaultViewResult> createPlatform_Pre($grpc.ServiceCall call, $async.Future<$3.CreatePlatformDefaultViewRequest> request) async {
-    return createPlatform(call, await request);
+  $async.Future<$3.CreatePlatformDefaultViewResult> createPlatform_Pre($grpc.ServiceCall $call, $async.Future<$3.CreatePlatformDefaultViewRequest> $request) async {
+    return createPlatform($call, await $request);
   }
 
-  $async.Future<$3.UpdatePlatformDefaultViewResult> updatePlatform_Pre($grpc.ServiceCall call, $async.Future<$3.UpdatePlatformDefaultViewRequest> request) async {
-    return updatePlatform(call, await request);
+  $async.Future<$3.UpdatePlatformDefaultViewResult> updatePlatform_Pre($grpc.ServiceCall $call, $async.Future<$3.UpdatePlatformDefaultViewRequest> $request) async {
+    return updatePlatform($call, await $request);
   }
 
   $async.Future<$3.CreatePlatformDefaultViewResult> createPlatform($grpc.ServiceCall call, $3.CreatePlatformDefaultViewRequest request);
diff --git a/lib/viz-default-view.pbjson.dart b/lib/viz-default-view.pbjson.dart
index 48cf1d7..b102356 100644
--- a/lib/viz-default-view.pbjson.dart
+++ b/lib/viz-default-view.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-default-view.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/viz-motd.pb.dart b/lib/viz-motd.pb.dart
index f2203af..1cff6c6 100644
--- a/lib/viz-motd.pb.dart
+++ b/lib/viz-motd.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-motd.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -13,6 +13,8 @@ import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 class Motd extends $pb.GeneratedMessage {
   factory Motd({
     $core.String? motdID,
@@ -75,7 +77,7 @@ class Motd extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasMotdID() => $_has(0);
   @$pb.TagNumber(1)
-  void clearMotdID() => clearField(1);
+  void clearMotdID() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get startDate => $_getSZ(1);
@@ -84,7 +86,7 @@ class Motd extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasStartDate() => $_has(1);
   @$pb.TagNumber(2)
-  void clearStartDate() => clearField(2);
+  void clearStartDate() => $_clearField(2);
 
   @$pb.TagNumber(3)
   $core.String get endDate => $_getSZ(2);
@@ -93,10 +95,10 @@ class Motd extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasEndDate() => $_has(2);
   @$pb.TagNumber(3)
-  void clearEndDate() => clearField(3);
+  void clearEndDate() => $_clearField(3);
 
   @$pb.TagNumber(4)
-  $core.List<MotdMessage> get message => $_getList(3);
+  $pb.PbList<MotdMessage> get message => $_getList(3);
 }
 
 class MotdMessage extends $pb.GeneratedMessage {
@@ -152,7 +154,7 @@ class MotdMessage extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasLang() => $_has(0);
   @$pb.TagNumber(1)
-  void clearLang() => clearField(1);
+  void clearLang() => $_clearField(1);
 
   /// The message content
   @$pb.TagNumber(2)
@@ -162,7 +164,7 @@ class MotdMessage extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasMessage() => $_has(1);
   @$pb.TagNumber(2)
-  void clearMessage() => clearField(2);
+  void clearMessage() => $_clearField(2);
 }
 
 class MotdMessageRes extends $pb.GeneratedMessage {
@@ -218,7 +220,7 @@ class MotdMessageRes extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasLang() => $_has(0);
   @$pb.TagNumber(1)
-  void clearLang() => clearField(1);
+  void clearLang() => $_clearField(1);
 
   /// The message content
   @$pb.TagNumber(2)
@@ -228,7 +230,7 @@ class MotdMessageRes extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasMessage() => $_has(1);
   @$pb.TagNumber(2)
-  void clearMessage() => clearField(2);
+  void clearMessage() => $_clearField(2);
 }
 
 /// Message request with the content and the dates
@@ -290,7 +292,7 @@ class CreateMotdRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasStartDate() => $_has(0);
   @$pb.TagNumber(1)
-  void clearStartDate() => clearField(1);
+  void clearStartDate() => $_clearField(1);
 
   /// UTC date/time in ISO 8601 format with time zone (accepted tzd formats: [+01:00, -01:00, Z])
   @$pb.TagNumber(2)
@@ -300,10 +302,10 @@ class CreateMotdRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasEndDate() => $_has(1);
   @$pb.TagNumber(2)
-  void clearEndDate() => clearField(2);
+  void clearEndDate() => $_clearField(2);
 
   @$pb.TagNumber(3)
-  $core.List<MotdMessage> get message => $_getList(2);
+  $pb.PbList<MotdMessage> get message => $_getList(2);
 }
 
 /// Message result with ID, content and dates
@@ -369,7 +371,7 @@ class CreateMotdResult extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasID() => $_has(0);
   @$pb.TagNumber(1)
-  void clearID() => clearField(1);
+  void clearID() => $_clearField(1);
 
   /// UTC date/time in ISO 8601 format with time zone (accepted tzd formats: [+01:00, -01:00, Z])
   @$pb.TagNumber(2)
@@ -379,7 +381,7 @@ class CreateMotdResult extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasStartDate() => $_has(1);
   @$pb.TagNumber(2)
-  void clearStartDate() => clearField(2);
+  void clearStartDate() => $_clearField(2);
 
   /// UTC date/time in ISO 8601 format with time zone (accepted tzd formats: [+01:00, -01:00, Z])
   @$pb.TagNumber(3)
@@ -389,10 +391,10 @@ class CreateMotdResult extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasEndDate() => $_has(2);
   @$pb.TagNumber(3)
-  void clearEndDate() => clearField(3);
+  void clearEndDate() => $_clearField(3);
 
   @$pb.TagNumber(4)
-  $core.List<MotdMessageRes> get message => $_getList(3);
+  $pb.PbList<MotdMessageRes> get message => $_getList(3);
 }
 
 /// Update an existing Message Of The Day using its key
@@ -458,7 +460,7 @@ class UpdateMotdRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasID() => $_has(0);
   @$pb.TagNumber(1)
-  void clearID() => clearField(1);
+  void clearID() => $_clearField(1);
 
   /// UTC date/time in ISO 8601 format with time zone (accepted tzd formats: [+01:00, -01:00, Z])
   @$pb.TagNumber(2)
@@ -468,7 +470,7 @@ class UpdateMotdRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasStartDate() => $_has(1);
   @$pb.TagNumber(2)
-  void clearStartDate() => clearField(2);
+  void clearStartDate() => $_clearField(2);
 
   /// UTC date/time in ISO 8601 format with time zone (accepted tzd formats: [+01:00, -01:00, Z])
   @$pb.TagNumber(3)
@@ -478,10 +480,10 @@ class UpdateMotdRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasEndDate() => $_has(2);
   @$pb.TagNumber(3)
-  void clearEndDate() => clearField(3);
+  void clearEndDate() => $_clearField(3);
 
   @$pb.TagNumber(4)
-  $core.List<MotdMessage> get message => $_getList(3);
+  $pb.PbList<MotdMessage> get message => $_getList(3);
 }
 
 class UpdateMotdResult extends $pb.GeneratedMessage {
@@ -546,7 +548,7 @@ class UpdateMotdResult extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasID() => $_has(0);
   @$pb.TagNumber(1)
-  void clearID() => clearField(1);
+  void clearID() => $_clearField(1);
 
   /// UTC date/time in ISO 8601 format with time zone (accepted tzd formats: [+01:00, -01:00, Z])
   @$pb.TagNumber(2)
@@ -556,7 +558,7 @@ class UpdateMotdResult extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasStartDate() => $_has(1);
   @$pb.TagNumber(2)
-  void clearStartDate() => clearField(2);
+  void clearStartDate() => $_clearField(2);
 
   /// UTC date/time in ISO 8601 format with time zone (accepted tzd formats: [+01:00, -01:00, Z])
   @$pb.TagNumber(3)
@@ -566,10 +568,10 @@ class UpdateMotdResult extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasEndDate() => $_has(2);
   @$pb.TagNumber(3)
-  void clearEndDate() => clearField(3);
+  void clearEndDate() => $_clearField(3);
 
   @$pb.TagNumber(4)
-  $core.List<MotdMessage> get message => $_getList(3);
+  $pb.PbList<MotdMessage> get message => $_getList(3);
 }
 
 class GetMotdRequest extends $pb.GeneratedMessage {
@@ -667,7 +669,7 @@ class GetMotdResult extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasID() => $_has(0);
   @$pb.TagNumber(1)
-  void clearID() => clearField(1);
+  void clearID() => $_clearField(1);
 
   /// UTC date/time in ISO 8601 format with time zone (accepted tzd formats: [+01:00, -01:00, Z])
   @$pb.TagNumber(2)
@@ -677,7 +679,7 @@ class GetMotdResult extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasStartDate() => $_has(1);
   @$pb.TagNumber(2)
-  void clearStartDate() => clearField(2);
+  void clearStartDate() => $_clearField(2);
 
   /// UTC date/time in ISO 8601 format with time zone (accepted tzd formats: [+01:00, -01:00, Z])
   @$pb.TagNumber(3)
@@ -687,10 +689,10 @@ class GetMotdResult extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasEndDate() => $_has(2);
   @$pb.TagNumber(3)
-  void clearEndDate() => clearField(3);
+  void clearEndDate() => $_clearField(3);
 
   @$pb.TagNumber(4)
-  $core.List<MotdMessageRes> get message => $_getList(3);
+  $pb.PbList<MotdMessageRes> get message => $_getList(3);
 }
 
 class DeleteMotdRequest extends $pb.GeneratedMessage {
@@ -740,7 +742,7 @@ class DeleteMotdRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasID() => $_has(0);
   @$pb.TagNumber(1)
-  void clearID() => clearField(1);
+  void clearID() => $_clearField(1);
 }
 
 class DeleteMotdResult extends $pb.GeneratedMessage {
@@ -849,7 +851,7 @@ class ListMotdsResult extends $pb.GeneratedMessage {
   static ListMotdsResult? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $core.List<GetMotdResult> get motds => $_getList(0);
+  $pb.PbList<GetMotdResult> get motds => $_getList(0);
 }
 
 
diff --git a/lib/viz-motd.pbenum.dart b/lib/viz-motd.pbenum.dart
index d1d43f5..1599df7 100644
--- a/lib/viz-motd.pbenum.dart
+++ b/lib/viz-motd.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-motd.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/viz-motd.pbgrpc.dart b/lib/viz-motd.pbgrpc.dart
index 02777a5..140f629 100644
--- a/lib/viz-motd.pbgrpc.dart
+++ b/lib/viz-motd.pbgrpc.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-motd.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -111,24 +111,24 @@ abstract class MotdServiceBase extends $grpc.Service {
         ($0.ListMotdsResult value) => value.writeToBuffer()));
   }
 
-  $async.Future<$0.GetMotdResult> get_Pre($grpc.ServiceCall call, $async.Future<$0.GetMotdRequest> request) async {
-    return get(call, await request);
+  $async.Future<$0.GetMotdResult> get_Pre($grpc.ServiceCall $call, $async.Future<$0.GetMotdRequest> $request) async {
+    return get($call, await $request);
   }
 
-  $async.Future<$0.CreateMotdResult> create_Pre($grpc.ServiceCall call, $async.Future<$0.CreateMotdRequest> request) async {
-    return create(call, await request);
+  $async.Future<$0.CreateMotdResult> create_Pre($grpc.ServiceCall $call, $async.Future<$0.CreateMotdRequest> $request) async {
+    return create($call, await $request);
   }
 
-  $async.Future<$0.UpdateMotdResult> update_Pre($grpc.ServiceCall call, $async.Future<$0.UpdateMotdRequest> request) async {
-    return update(call, await request);
+  $async.Future<$0.UpdateMotdResult> update_Pre($grpc.ServiceCall $call, $async.Future<$0.UpdateMotdRequest> $request) async {
+    return update($call, await $request);
   }
 
-  $async.Future<$0.DeleteMotdResult> delete_Pre($grpc.ServiceCall call, $async.Future<$0.DeleteMotdRequest> request) async {
-    return delete(call, await request);
+  $async.Future<$0.DeleteMotdResult> delete_Pre($grpc.ServiceCall $call, $async.Future<$0.DeleteMotdRequest> $request) async {
+    return delete($call, await $request);
   }
 
-  $async.Future<$0.ListMotdsResult> list_Pre($grpc.ServiceCall call, $async.Future<$0.ListMotdsRequest> request) async {
-    return list(call, await request);
+  $async.Future<$0.ListMotdsResult> list_Pre($grpc.ServiceCall $call, $async.Future<$0.ListMotdsRequest> $request) async {
+    return list($call, await $request);
   }
 
   $async.Future<$0.GetMotdResult> get($grpc.ServiceCall call, $0.GetMotdRequest request);
diff --git a/lib/viz-motd.pbjson.dart b/lib/viz-motd.pbjson.dart
index 9756aff..2dc0690 100644
--- a/lib/viz-motd.pbjson.dart
+++ b/lib/viz-motd.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-motd.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/viz-organisation-settings.pb.dart b/lib/viz-organisation-settings.pb.dart
index c850f8d..8390d47 100644
--- a/lib/viz-organisation-settings.pb.dart
+++ b/lib/viz-organisation-settings.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-organisation-settings.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -16,6 +16,8 @@ import 'package:protobuf/protobuf.dart' as $pb;
 import 'core/shared.pb.dart' as $16;
 import 'viz-organisation-settings.pbenum.dart';
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 export 'viz-organisation-settings.pbenum.dart';
 
 class OrganisationSetting extends $pb.GeneratedMessage {
@@ -80,7 +82,7 @@ class OrganisationSetting extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasOrganisationID() => $_has(0);
   @$pb.TagNumber(1)
-  void clearOrganisationID() => clearField(1);
+  void clearOrganisationID() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get key => $_getSZ(1);
@@ -89,7 +91,7 @@ class OrganisationSetting extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasKey() => $_has(1);
   @$pb.TagNumber(2)
-  void clearKey() => clearField(2);
+  void clearKey() => $_clearField(2);
 
   @$pb.TagNumber(3)
   $core.String get value => $_getSZ(2);
@@ -98,16 +100,16 @@ class OrganisationSetting extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasValue() => $_has(2);
   @$pb.TagNumber(3)
-  void clearValue() => clearField(3);
+  void clearValue() => $_clearField(3);
 
   @$pb.TagNumber(4)
   SettingVisibility get visibility => $_getN(3);
   @$pb.TagNumber(4)
-  set visibility(SettingVisibility v) { setField(4, v); }
+  set visibility(SettingVisibility v) { $_setField(4, v); }
   @$pb.TagNumber(4)
   $core.bool hasVisibility() => $_has(3);
   @$pb.TagNumber(4)
-  void clearVisibility() => clearField(4);
+  void clearVisibility() => $_clearField(4);
 }
 
 /// Key, Value pair to store
@@ -169,11 +171,11 @@ class PutOrganisationSettingRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $16.RequestOrganisationHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($16.RequestOrganisationHeader v) { setField(1, v); }
+  set header($16.RequestOrganisationHeader v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
-  void clearHeader() => clearField(1);
+  void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
   $16.RequestOrganisationHeader ensureHeader() => $_ensure(0);
 
@@ -184,7 +186,7 @@ class PutOrganisationSettingRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasKey() => $_has(1);
   @$pb.TagNumber(2)
-  void clearKey() => clearField(2);
+  void clearKey() => $_clearField(2);
 
   @$pb.TagNumber(3)
   $core.String get value => $_getSZ(2);
@@ -193,16 +195,16 @@ class PutOrganisationSettingRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasValue() => $_has(2);
   @$pb.TagNumber(3)
-  void clearValue() => clearField(3);
+  void clearValue() => $_clearField(3);
 
   @$pb.TagNumber(4)
   SettingVisibility get visibility => $_getN(3);
   @$pb.TagNumber(4)
-  set visibility(SettingVisibility v) { setField(4, v); }
+  set visibility(SettingVisibility v) { $_setField(4, v); }
   @$pb.TagNumber(4)
   $core.bool hasVisibility() => $_has(3);
   @$pb.TagNumber(4)
-  void clearVisibility() => clearField(4);
+  void clearVisibility() => $_clearField(4);
 }
 
 /// Key, Value pair response
@@ -263,7 +265,7 @@ class PutOrganisationSettingResult extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasKey() => $_has(0);
   @$pb.TagNumber(1)
-  void clearKey() => clearField(1);
+  void clearKey() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get value => $_getSZ(1);
@@ -272,16 +274,16 @@ class PutOrganisationSettingResult extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasValue() => $_has(1);
   @$pb.TagNumber(2)
-  void clearValue() => clearField(2);
+  void clearValue() => $_clearField(2);
 
   @$pb.TagNumber(3)
   SettingVisibility get visibility => $_getN(2);
   @$pb.TagNumber(3)
-  set visibility(SettingVisibility v) { setField(3, v); }
+  set visibility(SettingVisibility v) { $_setField(3, v); }
   @$pb.TagNumber(3)
   $core.bool hasVisibility() => $_has(2);
   @$pb.TagNumber(3)
-  void clearVisibility() => clearField(3);
+  void clearVisibility() => $_clearField(3);
 }
 
 /// Key of the organisation's setting to get
@@ -333,11 +335,11 @@ class GetOrganisationSettingRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $16.RequestOrganisationHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($16.RequestOrganisationHeader v) { setField(1, v); }
+  set header($16.RequestOrganisationHeader v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
-  void clearHeader() => clearField(1);
+  void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
   $16.RequestOrganisationHeader ensureHeader() => $_ensure(0);
 
@@ -348,7 +350,7 @@ class GetOrganisationSettingRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasKey() => $_has(1);
   @$pb.TagNumber(2)
-  void clearKey() => clearField(2);
+  void clearKey() => $_clearField(2);
 }
 
 /// Key, Value pair response
@@ -409,7 +411,7 @@ class GetOrganisationSettingResult extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasKey() => $_has(0);
   @$pb.TagNumber(1)
-  void clearKey() => clearField(1);
+  void clearKey() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get value => $_getSZ(1);
@@ -418,16 +420,16 @@ class GetOrganisationSettingResult extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasValue() => $_has(1);
   @$pb.TagNumber(2)
-  void clearValue() => clearField(2);
+  void clearValue() => $_clearField(2);
 
   @$pb.TagNumber(3)
   SettingVisibility get visibility => $_getN(2);
   @$pb.TagNumber(3)
-  set visibility(SettingVisibility v) { setField(3, v); }
+  set visibility(SettingVisibility v) { $_setField(3, v); }
   @$pb.TagNumber(3)
   $core.bool hasVisibility() => $_has(2);
   @$pb.TagNumber(3)
-  void clearVisibility() => clearField(3);
+  void clearVisibility() => $_clearField(3);
 }
 
 /// Key of the organisation's setting to delete
@@ -479,11 +481,11 @@ class DeleteOrganisationSettingRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $16.RequestOrganisationHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($16.RequestOrganisationHeader v) { setField(1, v); }
+  set header($16.RequestOrganisationHeader v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
-  void clearHeader() => clearField(1);
+  void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
   $16.RequestOrganisationHeader ensureHeader() => $_ensure(0);
 
@@ -494,7 +496,7 @@ class DeleteOrganisationSettingRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasKey() => $_has(1);
   @$pb.TagNumber(2)
-  void clearKey() => clearField(2);
+  void clearKey() => $_clearField(2);
 }
 
 class DeleteOrganisationSettingResult extends $pb.GeneratedMessage {
@@ -572,11 +574,11 @@ class ListOrganisationSettingsRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $16.RequestOrganisationHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($16.RequestOrganisationHeader v) { setField(1, v); }
+  set header($16.RequestOrganisationHeader v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
-  void clearHeader() => clearField(1);
+  void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
   $16.RequestOrganisationHeader ensureHeader() => $_ensure(0);
 }
@@ -623,7 +625,7 @@ class ListOrganisationSettingsResult extends $pb.GeneratedMessage {
   static ListOrganisationSettingsResult? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $core.List<GetOrganisationSettingResult> get organisationSettings => $_getList(0);
+  $pb.PbList<GetOrganisationSettingResult> get organisationSettings => $_getList(0);
 }
 
 class DeleteSettingsForOrganisationRequest extends $pb.GeneratedMessage {
@@ -673,7 +675,7 @@ class DeleteSettingsForOrganisationRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasOrganisationID() => $_has(0);
   @$pb.TagNumber(1)
-  void clearOrganisationID() => clearField(1);
+  void clearOrganisationID() => $_clearField(1);
 }
 
 class DeleteSettingsForOrganisationResult extends $pb.GeneratedMessage {
diff --git a/lib/viz-organisation-settings.pbenum.dart b/lib/viz-organisation-settings.pbenum.dart
index 51e062f..f6a4945 100644
--- a/lib/viz-organisation-settings.pbenum.dart
+++ b/lib/viz-organisation-settings.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-organisation-settings.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -27,7 +27,7 @@ class SettingVisibility extends $pb.ProtobufEnum {
   static final $core.Map<$core.int, SettingVisibility> _byValue = $pb.ProtobufEnum.initByValue(values);
   static SettingVisibility? valueOf($core.int value) => _byValue[value];
 
-  const SettingVisibility._($core.int v, $core.String n) : super(v, n);
+  const SettingVisibility._(super.v, super.n);
 }
 
 
diff --git a/lib/viz-organisation-settings.pbgrpc.dart b/lib/viz-organisation-settings.pbgrpc.dart
index 99ac032..9b717e6 100644
--- a/lib/viz-organisation-settings.pbgrpc.dart
+++ b/lib/viz-organisation-settings.pbgrpc.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-organisation-settings.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -111,24 +111,24 @@ abstract class OrganisationSettingsServiceBase extends $grpc.Service {
         ($7.DeleteSettingsForOrganisationResult value) => value.writeToBuffer()));
   }
 
-  $async.Future<$7.GetOrganisationSettingResult> get_Pre($grpc.ServiceCall call, $async.Future<$7.GetOrganisationSettingRequest> request) async {
-    return get(call, await request);
+  $async.Future<$7.GetOrganisationSettingResult> get_Pre($grpc.ServiceCall $call, $async.Future<$7.GetOrganisationSettingRequest> $request) async {
+    return get($call, await $request);
   }
 
-  $async.Future<$7.PutOrganisationSettingResult> put_Pre($grpc.ServiceCall call, $async.Future<$7.PutOrganisationSettingRequest> request) async {
-    return put(call, await request);
+  $async.Future<$7.PutOrganisationSettingResult> put_Pre($grpc.ServiceCall $call, $async.Future<$7.PutOrganisationSettingRequest> $request) async {
+    return put($call, await $request);
   }
 
-  $async.Future<$7.DeleteOrganisationSettingResult> delete_Pre($grpc.ServiceCall call, $async.Future<$7.DeleteOrganisationSettingRequest> request) async {
-    return delete(call, await request);
+  $async.Future<$7.DeleteOrganisationSettingResult> delete_Pre($grpc.ServiceCall $call, $async.Future<$7.DeleteOrganisationSettingRequest> $request) async {
+    return delete($call, await $request);
   }
 
-  $async.Future<$7.ListOrganisationSettingsResult> list_Pre($grpc.ServiceCall call, $async.Future<$7.ListOrganisationSettingsRequest> request) async {
-    return list(call, await request);
+  $async.Future<$7.ListOrganisationSettingsResult> list_Pre($grpc.ServiceCall $call, $async.Future<$7.ListOrganisationSettingsRequest> $request) async {
+    return list($call, await $request);
   }
 
-  $async.Future<$7.DeleteSettingsForOrganisationResult> deleteSettingsForOrganisation_Pre($grpc.ServiceCall call, $async.Future<$7.DeleteSettingsForOrganisationRequest> request) async {
-    return deleteSettingsForOrganisation(call, await request);
+  $async.Future<$7.DeleteSettingsForOrganisationResult> deleteSettingsForOrganisation_Pre($grpc.ServiceCall $call, $async.Future<$7.DeleteSettingsForOrganisationRequest> $request) async {
+    return deleteSettingsForOrganisation($call, await $request);
   }
 
   $async.Future<$7.GetOrganisationSettingResult> get($grpc.ServiceCall call, $7.GetOrganisationSettingRequest request);
diff --git a/lib/viz-organisation-settings.pbjson.dart b/lib/viz-organisation-settings.pbjson.dart
index 20f9c4a..ba94ee1 100644
--- a/lib/viz-organisation-settings.pbjson.dart
+++ b/lib/viz-organisation-settings.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-organisation-settings.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/viz-project-settings.pb.dart b/lib/viz-project-settings.pb.dart
index 1cf71c8..62b47bc 100644
--- a/lib/viz-project-settings.pb.dart
+++ b/lib/viz-project-settings.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-project-settings.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -16,6 +16,8 @@ import 'package:protobuf/protobuf.dart' as $pb;
 import 'core/shared.pb.dart' as $16;
 import 'viz-organisation-settings.pb.dart' as $7;
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 class ProjectSetting extends $pb.GeneratedMessage {
   factory ProjectSetting({
     $core.String? projectID,
@@ -73,7 +75,7 @@ class ProjectSetting extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasProjectID() => $_has(0);
   @$pb.TagNumber(1)
-  void clearProjectID() => clearField(1);
+  void clearProjectID() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get key => $_getSZ(1);
@@ -82,7 +84,7 @@ class ProjectSetting extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasKey() => $_has(1);
   @$pb.TagNumber(2)
-  void clearKey() => clearField(2);
+  void clearKey() => $_clearField(2);
 
   @$pb.TagNumber(3)
   $core.String get value => $_getSZ(2);
@@ -91,7 +93,7 @@ class ProjectSetting extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasValue() => $_has(2);
   @$pb.TagNumber(3)
-  void clearValue() => clearField(3);
+  void clearValue() => $_clearField(3);
 }
 
 /// Key, Value pair to store
@@ -148,11 +150,11 @@ class PutProjectSettingRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $16.RequestProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($16.RequestProjectHeader v) { setField(1, v); }
+  set header($16.RequestProjectHeader v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
-  void clearHeader() => clearField(1);
+  void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
   $16.RequestProjectHeader ensureHeader() => $_ensure(0);
 
@@ -163,7 +165,7 @@ class PutProjectSettingRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasKey() => $_has(1);
   @$pb.TagNumber(2)
-  void clearKey() => clearField(2);
+  void clearKey() => $_clearField(2);
 
   @$pb.TagNumber(3)
   $core.String get value => $_getSZ(2);
@@ -172,7 +174,7 @@ class PutProjectSettingRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasValue() => $_has(2);
   @$pb.TagNumber(3)
-  void clearValue() => clearField(3);
+  void clearValue() => $_clearField(3);
 }
 
 /// Key, Value pair response
@@ -228,7 +230,7 @@ class PutProjectSettingResult extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasKey() => $_has(0);
   @$pb.TagNumber(1)
-  void clearKey() => clearField(1);
+  void clearKey() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get value => $_getSZ(1);
@@ -237,7 +239,7 @@ class PutProjectSettingResult extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasValue() => $_has(1);
   @$pb.TagNumber(2)
-  void clearValue() => clearField(2);
+  void clearValue() => $_clearField(2);
 }
 
 /// Key of the project's setting to get
@@ -289,11 +291,11 @@ class GetProjectSettingRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $16.RequestProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($16.RequestProjectHeader v) { setField(1, v); }
+  set header($16.RequestProjectHeader v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
-  void clearHeader() => clearField(1);
+  void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
   $16.RequestProjectHeader ensureHeader() => $_ensure(0);
 
@@ -304,7 +306,7 @@ class GetProjectSettingRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasKey() => $_has(1);
   @$pb.TagNumber(2)
-  void clearKey() => clearField(2);
+  void clearKey() => $_clearField(2);
 }
 
 /// Key, Value pair response
@@ -360,7 +362,7 @@ class GetProjectSettingResult extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasKey() => $_has(0);
   @$pb.TagNumber(1)
-  void clearKey() => clearField(1);
+  void clearKey() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get value => $_getSZ(1);
@@ -369,7 +371,7 @@ class GetProjectSettingResult extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasValue() => $_has(1);
   @$pb.TagNumber(2)
-  void clearValue() => clearField(2);
+  void clearValue() => $_clearField(2);
 }
 
 /// Key of the project's setting to delete
@@ -421,11 +423,11 @@ class DeleteProjectSettingRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $16.RequestProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($16.RequestProjectHeader v) { setField(1, v); }
+  set header($16.RequestProjectHeader v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
-  void clearHeader() => clearField(1);
+  void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
   $16.RequestProjectHeader ensureHeader() => $_ensure(0);
 
@@ -436,7 +438,7 @@ class DeleteProjectSettingRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasKey() => $_has(1);
   @$pb.TagNumber(2)
-  void clearKey() => clearField(2);
+  void clearKey() => $_clearField(2);
 }
 
 class DeleteProjectSettingResult extends $pb.GeneratedMessage {
@@ -514,11 +516,11 @@ class ListProjectSettingsRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $16.RequestProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($16.RequestProjectHeader v) { setField(1, v); }
+  set header($16.RequestProjectHeader v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
-  void clearHeader() => clearField(1);
+  void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
   $16.RequestProjectHeader ensureHeader() => $_ensure(0);
 }
@@ -565,7 +567,7 @@ class ListProjectSettingsResult extends $pb.GeneratedMessage {
   static ListProjectSettingsResult? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $core.List<GetProjectSettingResult> get projectSettings => $_getList(0);
+  $pb.PbList<GetProjectSettingResult> get projectSettings => $_getList(0);
 }
 
 class ListProjectOrganisationSettingsRequest extends $pb.GeneratedMessage {
@@ -611,11 +613,11 @@ class ListProjectOrganisationSettingsRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $16.RequestProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($16.RequestProjectHeader v) { setField(1, v); }
+  set header($16.RequestProjectHeader v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
-  void clearHeader() => clearField(1);
+  void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
   $16.RequestProjectHeader ensureHeader() => $_ensure(0);
 }
@@ -662,7 +664,7 @@ class ListProjectOrganisationSettingsResult extends $pb.GeneratedMessage {
   static ListProjectOrganisationSettingsResult? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $core.List<$7.GetOrganisationSettingResult> get organisationSettings => $_getList(0);
+  $pb.PbList<$7.GetOrganisationSettingResult> get organisationSettings => $_getList(0);
 }
 
 class DeleteSettingsForProjectRequest extends $pb.GeneratedMessage {
@@ -712,7 +714,7 @@ class DeleteSettingsForProjectRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasProjectID() => $_has(0);
   @$pb.TagNumber(1)
-  void clearProjectID() => clearField(1);
+  void clearProjectID() => $_clearField(1);
 }
 
 class DeleteSettingsForProjectResult extends $pb.GeneratedMessage {
diff --git a/lib/viz-project-settings.pbenum.dart b/lib/viz-project-settings.pbenum.dart
index 78efeac..5a02ea2 100644
--- a/lib/viz-project-settings.pbenum.dart
+++ b/lib/viz-project-settings.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-project-settings.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/viz-project-settings.pbgrpc.dart b/lib/viz-project-settings.pbgrpc.dart
index abf5040..606abcf 100644
--- a/lib/viz-project-settings.pbgrpc.dart
+++ b/lib/viz-project-settings.pbgrpc.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-project-settings.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -126,28 +126,28 @@ abstract class ProjectSettingsServiceBase extends $grpc.Service {
         ($8.DeleteSettingsForProjectResult value) => value.writeToBuffer()));
   }
 
-  $async.Future<$8.GetProjectSettingResult> get_Pre($grpc.ServiceCall call, $async.Future<$8.GetProjectSettingRequest> request) async {
-    return get(call, await request);
+  $async.Future<$8.GetProjectSettingResult> get_Pre($grpc.ServiceCall $call, $async.Future<$8.GetProjectSettingRequest> $request) async {
+    return get($call, await $request);
   }
 
-  $async.Future<$8.PutProjectSettingResult> put_Pre($grpc.ServiceCall call, $async.Future<$8.PutProjectSettingRequest> request) async {
-    return put(call, await request);
+  $async.Future<$8.PutProjectSettingResult> put_Pre($grpc.ServiceCall $call, $async.Future<$8.PutProjectSettingRequest> $request) async {
+    return put($call, await $request);
   }
 
-  $async.Future<$8.DeleteProjectSettingResult> delete_Pre($grpc.ServiceCall call, $async.Future<$8.DeleteProjectSettingRequest> request) async {
-    return delete(call, await request);
+  $async.Future<$8.DeleteProjectSettingResult> delete_Pre($grpc.ServiceCall $call, $async.Future<$8.DeleteProjectSettingRequest> $request) async {
+    return delete($call, await $request);
   }
 
-  $async.Future<$8.ListProjectSettingsResult> list_Pre($grpc.ServiceCall call, $async.Future<$8.ListProjectSettingsRequest> request) async {
-    return list(call, await request);
+  $async.Future<$8.ListProjectSettingsResult> list_Pre($grpc.ServiceCall $call, $async.Future<$8.ListProjectSettingsRequest> $request) async {
+    return list($call, await $request);
   }
 
-  $async.Future<$8.ListProjectOrganisationSettingsResult> listOrganisationSettings_Pre($grpc.ServiceCall call, $async.Future<$8.ListProjectOrganisationSettingsRequest> request) async {
-    return listOrganisationSettings(call, await request);
+  $async.Future<$8.ListProjectOrganisationSettingsResult> listOrganisationSettings_Pre($grpc.ServiceCall $call, $async.Future<$8.ListProjectOrganisationSettingsRequest> $request) async {
+    return listOrganisationSettings($call, await $request);
   }
 
-  $async.Future<$8.DeleteSettingsForProjectResult> deleteSettingsForProject_Pre($grpc.ServiceCall call, $async.Future<$8.DeleteSettingsForProjectRequest> request) async {
-    return deleteSettingsForProject(call, await request);
+  $async.Future<$8.DeleteSettingsForProjectResult> deleteSettingsForProject_Pre($grpc.ServiceCall $call, $async.Future<$8.DeleteSettingsForProjectRequest> $request) async {
+    return deleteSettingsForProject($call, await $request);
   }
 
   $async.Future<$8.GetProjectSettingResult> get($grpc.ServiceCall call, $8.GetProjectSettingRequest request);
diff --git a/lib/viz-project-settings.pbjson.dart b/lib/viz-project-settings.pbjson.dart
index 27ed79a..2a71f37 100644
--- a/lib/viz-project-settings.pbjson.dart
+++ b/lib/viz-project-settings.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-project-settings.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/viz-tab.pb.dart b/lib/viz-tab.pb.dart
index 1fa5aaa..e0e46ea 100644
--- a/lib/viz-tab.pb.dart
+++ b/lib/viz-tab.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-tab.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -13,6 +13,8 @@ import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 class ListTabRequest extends $pb.GeneratedMessage {
   factory ListTabRequest({
     $core.String? tabID,
@@ -61,7 +63,7 @@ class ListTabRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasTabID() => $_has(0);
   @$pb.TagNumber(1)
-  void clearTabID() => clearField(1);
+  void clearTabID() => $_clearField(1);
 }
 
 class ListTabResult extends $pb.GeneratedMessage {
@@ -112,7 +114,7 @@ class ListTabResult extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasResult() => $_has(0);
   @$pb.TagNumber(1)
-  void clearResult() => clearField(1);
+  void clearResult() => $_clearField(1);
 }
 
 
diff --git a/lib/viz-tab.pbenum.dart b/lib/viz-tab.pbenum.dart
index 461cbe0..8a4faa2 100644
--- a/lib/viz-tab.pbenum.dart
+++ b/lib/viz-tab.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-tab.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/viz-tab.pbgrpc.dart b/lib/viz-tab.pbgrpc.dart
index b462b16..41415fe 100644
--- a/lib/viz-tab.pbgrpc.dart
+++ b/lib/viz-tab.pbgrpc.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-tab.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -51,8 +51,8 @@ abstract class TabServiceBase extends $grpc.Service {
         ($4.ListTabResult value) => value.writeToBuffer()));
   }
 
-  $async.Future<$4.ListTabResult> list_Pre($grpc.ServiceCall call, $async.Future<$4.ListTabRequest> request) async {
-    return list(call, await request);
+  $async.Future<$4.ListTabResult> list_Pre($grpc.ServiceCall $call, $async.Future<$4.ListTabRequest> $request) async {
+    return list($call, await $request);
   }
 
   $async.Future<$4.ListTabResult> list($grpc.ServiceCall call, $4.ListTabRequest request);
diff --git a/lib/viz-tab.pbjson.dart b/lib/viz-tab.pbjson.dart
index e60b4fe..0606ac5 100644
--- a/lib/viz-tab.pbjson.dart
+++ b/lib/viz-tab.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-tab.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/viz-translations.pb.dart b/lib/viz-translations.pb.dart
index f809312..f82a090 100644
--- a/lib/viz-translations.pb.dart
+++ b/lib/viz-translations.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-translations.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -15,6 +15,8 @@ import 'package:protobuf/protobuf.dart' as $pb;
 
 import 'core/shared.pb.dart' as $16;
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 class Label extends $pb.GeneratedMessage {
   factory Label({
     $core.String? iD,
@@ -77,7 +79,7 @@ class Label extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasID() => $_has(0);
   @$pb.TagNumber(1)
-  void clearID() => clearField(1);
+  void clearID() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get projectID => $_getSZ(1);
@@ -86,7 +88,7 @@ class Label extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasProjectID() => $_has(1);
   @$pb.TagNumber(2)
-  void clearProjectID() => clearField(2);
+  void clearProjectID() => $_clearField(2);
 
   @$pb.TagNumber(3)
   $core.String get context => $_getSZ(2);
@@ -95,7 +97,7 @@ class Label extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasContext() => $_has(2);
   @$pb.TagNumber(3)
-  void clearContext() => clearField(3);
+  void clearContext() => $_clearField(3);
 
   @$pb.TagNumber(4)
   $core.String get label => $_getSZ(3);
@@ -104,7 +106,7 @@ class Label extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasLabel() => $_has(3);
   @$pb.TagNumber(4)
-  void clearLabel() => clearField(4);
+  void clearLabel() => $_clearField(4);
 }
 
 class LanguageCode extends $pb.GeneratedMessage {
@@ -154,7 +156,7 @@ class LanguageCode extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasCode() => $_has(0);
   @$pb.TagNumber(1)
-  void clearCode() => clearField(1);
+  void clearCode() => $_clearField(1);
 }
 
 class Translation extends $pb.GeneratedMessage {
@@ -214,7 +216,7 @@ class Translation extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasLabelID() => $_has(0);
   @$pb.TagNumber(1)
-  void clearLabelID() => clearField(1);
+  void clearLabelID() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get languageCode => $_getSZ(1);
@@ -223,7 +225,7 @@ class Translation extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasLanguageCode() => $_has(1);
   @$pb.TagNumber(2)
-  void clearLanguageCode() => clearField(2);
+  void clearLanguageCode() => $_clearField(2);
 
   @$pb.TagNumber(3)
   $core.String get translation => $_getSZ(2);
@@ -232,7 +234,7 @@ class Translation extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasTranslation() => $_has(2);
   @$pb.TagNumber(3)
-  void clearTranslation() => clearField(3);
+  void clearTranslation() => $_clearField(3);
 }
 
 class GetTranslationsRequest extends $pb.GeneratedMessage {
@@ -288,11 +290,11 @@ class GetTranslationsRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $16.RequestProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($16.RequestProjectHeader v) { setField(1, v); }
+  set header($16.RequestProjectHeader v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
-  void clearHeader() => clearField(1);
+  void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
   $16.RequestProjectHeader ensureHeader() => $_ensure(0);
 
@@ -303,7 +305,7 @@ class GetTranslationsRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasContext() => $_has(1);
   @$pb.TagNumber(2)
-  void clearContext() => clearField(2);
+  void clearContext() => $_clearField(2);
 
   @$pb.TagNumber(3)
   $core.String get label => $_getSZ(2);
@@ -312,7 +314,7 @@ class GetTranslationsRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasLabel() => $_has(2);
   @$pb.TagNumber(3)
-  void clearLabel() => clearField(3);
+  void clearLabel() => $_clearField(3);
 }
 
 class GetTranslationsResult extends $pb.GeneratedMessage {
@@ -356,7 +358,7 @@ class GetTranslationsResult extends $pb.GeneratedMessage {
   static GetTranslationsResult? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $core.List<Translation> get translations => $_getList(0);
+  $pb.PbList<Translation> get translations => $_getList(0);
 }
 
 /// Message used to Put a translation for a label in the PutTranslationsRequest
@@ -412,7 +414,7 @@ class PutTranslationMessage extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasLanguageCode() => $_has(0);
   @$pb.TagNumber(1)
-  void clearLanguageCode() => clearField(1);
+  void clearLanguageCode() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get translation => $_getSZ(1);
@@ -421,7 +423,7 @@ class PutTranslationMessage extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasTranslation() => $_has(1);
   @$pb.TagNumber(2)
-  void clearTranslation() => clearField(2);
+  void clearTranslation() => $_clearField(2);
 }
 
 class PutTranslationsRequest extends $pb.GeneratedMessage {
@@ -482,11 +484,11 @@ class PutTranslationsRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $16.RequestProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($16.RequestProjectHeader v) { setField(1, v); }
+  set header($16.RequestProjectHeader v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
-  void clearHeader() => clearField(1);
+  void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
   $16.RequestProjectHeader ensureHeader() => $_ensure(0);
 
@@ -497,7 +499,7 @@ class PutTranslationsRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasContext() => $_has(1);
   @$pb.TagNumber(2)
-  void clearContext() => clearField(2);
+  void clearContext() => $_clearField(2);
 
   @$pb.TagNumber(3)
   $core.String get label => $_getSZ(2);
@@ -506,10 +508,10 @@ class PutTranslationsRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasLabel() => $_has(2);
   @$pb.TagNumber(3)
-  void clearLabel() => clearField(3);
+  void clearLabel() => $_clearField(3);
 
   @$pb.TagNumber(4)
-  $core.List<PutTranslationMessage> get translations => $_getList(3);
+  $pb.PbList<PutTranslationMessage> get translations => $_getList(3);
 }
 
 class PutTranslationsResult extends $pb.GeneratedMessage {
@@ -553,7 +555,7 @@ class PutTranslationsResult extends $pb.GeneratedMessage {
   static PutTranslationsResult? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $core.List<Translation> get translations => $_getList(0);
+  $pb.PbList<Translation> get translations => $_getList(0);
 }
 
 class DeleteTranslationsRequest extends $pb.GeneratedMessage {
@@ -609,11 +611,11 @@ class DeleteTranslationsRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $16.RequestProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($16.RequestProjectHeader v) { setField(1, v); }
+  set header($16.RequestProjectHeader v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
-  void clearHeader() => clearField(1);
+  void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
   $16.RequestProjectHeader ensureHeader() => $_ensure(0);
 
@@ -624,7 +626,7 @@ class DeleteTranslationsRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasContext() => $_has(1);
   @$pb.TagNumber(2)
-  void clearContext() => clearField(2);
+  void clearContext() => $_clearField(2);
 
   @$pb.TagNumber(3)
   $core.String get label => $_getSZ(2);
@@ -633,7 +635,7 @@ class DeleteTranslationsRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasLabel() => $_has(2);
   @$pb.TagNumber(3)
-  void clearLabel() => clearField(3);
+  void clearLabel() => $_clearField(3);
 }
 
 class DeleteTranslationsResult extends $pb.GeneratedMessage {
@@ -716,11 +718,11 @@ class ListTranslationsRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $16.RequestProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($16.RequestProjectHeader v) { setField(1, v); }
+  set header($16.RequestProjectHeader v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
-  void clearHeader() => clearField(1);
+  void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
   $16.RequestProjectHeader ensureHeader() => $_ensure(0);
 
@@ -731,7 +733,7 @@ class ListTranslationsRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasLanguageCode() => $_has(1);
   @$pb.TagNumber(2)
-  void clearLanguageCode() => clearField(2);
+  void clearLanguageCode() => $_clearField(2);
 }
 
 /// Messages for the ListTranslationsResult
@@ -787,10 +789,10 @@ class TranslationContextResult extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasName() => $_has(0);
   @$pb.TagNumber(1)
-  void clearName() => clearField(1);
+  void clearName() => $_clearField(1);
 
   @$pb.TagNumber(2)
-  $core.List<TranslationLabelResult> get labels => $_getList(1);
+  $pb.PbList<TranslationLabelResult> get labels => $_getList(1);
 }
 
 class TranslationLabelResult extends $pb.GeneratedMessage {
@@ -845,7 +847,7 @@ class TranslationLabelResult extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasName() => $_has(0);
   @$pb.TagNumber(1)
-  void clearName() => clearField(1);
+  void clearName() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get translation => $_getSZ(1);
@@ -854,7 +856,7 @@ class TranslationLabelResult extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasTranslation() => $_has(1);
   @$pb.TagNumber(2)
-  void clearTranslation() => clearField(2);
+  void clearTranslation() => $_clearField(2);
 }
 
 class ListTranslationsResult extends $pb.GeneratedMessage {
@@ -898,7 +900,7 @@ class ListTranslationsResult extends $pb.GeneratedMessage {
   static ListTranslationsResult? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $core.List<TranslationContextResult> get contexts => $_getList(0);
+  $pb.PbList<TranslationContextResult> get contexts => $_getList(0);
 }
 
 class DeleteAllTranslationsRequest extends $pb.GeneratedMessage {
@@ -944,11 +946,11 @@ class DeleteAllTranslationsRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $16.RequestProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($16.RequestProjectHeader v) { setField(1, v); }
+  set header($16.RequestProjectHeader v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
-  void clearHeader() => clearField(1);
+  void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
   $16.RequestProjectHeader ensureHeader() => $_ensure(0);
 }
@@ -1058,7 +1060,7 @@ class GetLanguagesResult extends $pb.GeneratedMessage {
   static GetLanguagesResult? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $core.List<LanguageCode> get languages => $_getList(0);
+  $pb.PbList<LanguageCode> get languages => $_getList(0);
 }
 
 
diff --git a/lib/viz-translations.pbenum.dart b/lib/viz-translations.pbenum.dart
index a7b11f8..1c5c5c4 100644
--- a/lib/viz-translations.pbenum.dart
+++ b/lib/viz-translations.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-translations.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/viz-translations.pbgrpc.dart b/lib/viz-translations.pbgrpc.dart
index 58e9407..c49531f 100644
--- a/lib/viz-translations.pbgrpc.dart
+++ b/lib/viz-translations.pbgrpc.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-translations.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -126,28 +126,28 @@ abstract class TranslationsServiceBase extends $grpc.Service {
         ($5.GetLanguagesResult value) => value.writeToBuffer()));
   }
 
-  $async.Future<$5.GetTranslationsResult> get_Pre($grpc.ServiceCall call, $async.Future<$5.GetTranslationsRequest> request) async {
-    return get(call, await request);
+  $async.Future<$5.GetTranslationsResult> get_Pre($grpc.ServiceCall $call, $async.Future<$5.GetTranslationsRequest> $request) async {
+    return get($call, await $request);
   }
 
-  $async.Future<$5.PutTranslationsResult> put_Pre($grpc.ServiceCall call, $async.Future<$5.PutTranslationsRequest> request) async {
-    return put(call, await request);
+  $async.Future<$5.PutTranslationsResult> put_Pre($grpc.ServiceCall $call, $async.Future<$5.PutTranslationsRequest> $request) async {
+    return put($call, await $request);
   }
 
-  $async.Future<$5.DeleteTranslationsResult> delete_Pre($grpc.ServiceCall call, $async.Future<$5.DeleteTranslationsRequest> request) async {
-    return delete(call, await request);
+  $async.Future<$5.DeleteTranslationsResult> delete_Pre($grpc.ServiceCall $call, $async.Future<$5.DeleteTranslationsRequest> $request) async {
+    return delete($call, await $request);
   }
 
-  $async.Future<$5.ListTranslationsResult> list_Pre($grpc.ServiceCall call, $async.Future<$5.ListTranslationsRequest> request) async {
-    return list(call, await request);
+  $async.Future<$5.ListTranslationsResult> list_Pre($grpc.ServiceCall $call, $async.Future<$5.ListTranslationsRequest> $request) async {
+    return list($call, await $request);
   }
 
-  $async.Future<$5.DeleteAllTranslationsResult> deleteAll_Pre($grpc.ServiceCall call, $async.Future<$5.DeleteAllTranslationsRequest> request) async {
-    return deleteAll(call, await request);
+  $async.Future<$5.DeleteAllTranslationsResult> deleteAll_Pre($grpc.ServiceCall $call, $async.Future<$5.DeleteAllTranslationsRequest> $request) async {
+    return deleteAll($call, await $request);
   }
 
-  $async.Future<$5.GetLanguagesResult> getLanguages_Pre($grpc.ServiceCall call, $async.Future<$5.GetLanguagesRequest> request) async {
-    return getLanguages(call, await request);
+  $async.Future<$5.GetLanguagesResult> getLanguages_Pre($grpc.ServiceCall $call, $async.Future<$5.GetLanguagesRequest> $request) async {
+    return getLanguages($call, await $request);
   }
 
   $async.Future<$5.GetTranslationsResult> get($grpc.ServiceCall call, $5.GetTranslationsRequest request);
diff --git a/lib/viz-translations.pbjson.dart b/lib/viz-translations.pbjson.dart
index 0aa07d2..459cdf2 100644
--- a/lib/viz-translations.pbjson.dart
+++ b/lib/viz-translations.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-translations.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/viz-user-settings.pb.dart b/lib/viz-user-settings.pb.dart
index e049a57..e50ecff 100644
--- a/lib/viz-user-settings.pb.dart
+++ b/lib/viz-user-settings.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-user-settings.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -13,6 +13,8 @@ import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 class UserSetting extends $pb.GeneratedMessage {
   factory UserSetting({
     $core.String? userID,
@@ -70,7 +72,7 @@ class UserSetting extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasUserID() => $_has(0);
   @$pb.TagNumber(1)
-  void clearUserID() => clearField(1);
+  void clearUserID() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get key => $_getSZ(1);
@@ -79,7 +81,7 @@ class UserSetting extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasKey() => $_has(1);
   @$pb.TagNumber(2)
-  void clearKey() => clearField(2);
+  void clearKey() => $_clearField(2);
 
   @$pb.TagNumber(3)
   $core.String get value => $_getSZ(2);
@@ -88,7 +90,7 @@ class UserSetting extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasValue() => $_has(2);
   @$pb.TagNumber(3)
-  void clearValue() => clearField(3);
+  void clearValue() => $_clearField(3);
 }
 
 /// Key, Value pair to store
@@ -145,7 +147,7 @@ class PutUserSettingRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasKey() => $_has(0);
   @$pb.TagNumber(1)
-  void clearKey() => clearField(1);
+  void clearKey() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get value => $_getSZ(1);
@@ -154,7 +156,7 @@ class PutUserSettingRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasValue() => $_has(1);
   @$pb.TagNumber(2)
-  void clearValue() => clearField(2);
+  void clearValue() => $_clearField(2);
 }
 
 /// Key, Value pair response
@@ -210,7 +212,7 @@ class PutUserSettingResult extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasKey() => $_has(0);
   @$pb.TagNumber(1)
-  void clearKey() => clearField(1);
+  void clearKey() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get value => $_getSZ(1);
@@ -219,7 +221,7 @@ class PutUserSettingResult extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasValue() => $_has(1);
   @$pb.TagNumber(2)
-  void clearValue() => clearField(2);
+  void clearValue() => $_clearField(2);
 }
 
 /// Key of the user's setting to get
@@ -270,7 +272,7 @@ class GetUserSettingRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasKey() => $_has(0);
   @$pb.TagNumber(2)
-  void clearKey() => clearField(2);
+  void clearKey() => $_clearField(2);
 }
 
 /// Key, Value pair response
@@ -326,7 +328,7 @@ class GetUserSettingResult extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasKey() => $_has(0);
   @$pb.TagNumber(1)
-  void clearKey() => clearField(1);
+  void clearKey() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get value => $_getSZ(1);
@@ -335,7 +337,7 @@ class GetUserSettingResult extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasValue() => $_has(1);
   @$pb.TagNumber(2)
-  void clearValue() => clearField(2);
+  void clearValue() => $_clearField(2);
 }
 
 /// Key of the user's setting to delete
@@ -386,7 +388,7 @@ class DeleteUserSettingRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasKey() => $_has(0);
   @$pb.TagNumber(2)
-  void clearKey() => clearField(2);
+  void clearKey() => $_clearField(2);
 }
 
 class DeleteUserSettingResult extends $pb.GeneratedMessage {
@@ -495,7 +497,7 @@ class ListUserSettingsResult extends $pb.GeneratedMessage {
   static ListUserSettingsResult? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $core.List<GetUserSettingResult> get userSettings => $_getList(0);
+  $pb.PbList<GetUserSettingResult> get userSettings => $_getList(0);
 }
 
 
diff --git a/lib/viz-user-settings.pbenum.dart b/lib/viz-user-settings.pbenum.dart
index e9fe650..2d9fffa 100644
--- a/lib/viz-user-settings.pbenum.dart
+++ b/lib/viz-user-settings.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-user-settings.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/viz-user-settings.pbgrpc.dart b/lib/viz-user-settings.pbgrpc.dart
index 57117a5..e2a1e2c 100644
--- a/lib/viz-user-settings.pbgrpc.dart
+++ b/lib/viz-user-settings.pbgrpc.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-user-settings.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -96,20 +96,20 @@ abstract class UserSettingsServiceBase extends $grpc.Service {
         ($10.ListUserSettingsResult value) => value.writeToBuffer()));
   }
 
-  $async.Future<$10.GetUserSettingResult> get_Pre($grpc.ServiceCall call, $async.Future<$10.GetUserSettingRequest> request) async {
-    return get(call, await request);
+  $async.Future<$10.GetUserSettingResult> get_Pre($grpc.ServiceCall $call, $async.Future<$10.GetUserSettingRequest> $request) async {
+    return get($call, await $request);
   }
 
-  $async.Future<$10.PutUserSettingResult> put_Pre($grpc.ServiceCall call, $async.Future<$10.PutUserSettingRequest> request) async {
-    return put(call, await request);
+  $async.Future<$10.PutUserSettingResult> put_Pre($grpc.ServiceCall $call, $async.Future<$10.PutUserSettingRequest> $request) async {
+    return put($call, await $request);
   }
 
-  $async.Future<$10.DeleteUserSettingResult> delete_Pre($grpc.ServiceCall call, $async.Future<$10.DeleteUserSettingRequest> request) async {
-    return delete(call, await request);
+  $async.Future<$10.DeleteUserSettingResult> delete_Pre($grpc.ServiceCall $call, $async.Future<$10.DeleteUserSettingRequest> $request) async {
+    return delete($call, await $request);
   }
 
-  $async.Future<$10.ListUserSettingsResult> list_Pre($grpc.ServiceCall call, $async.Future<$10.ListUserSettingsRequest> request) async {
-    return list(call, await request);
+  $async.Future<$10.ListUserSettingsResult> list_Pre($grpc.ServiceCall $call, $async.Future<$10.ListUserSettingsRequest> $request) async {
+    return list($call, await $request);
   }
 
   $async.Future<$10.GetUserSettingResult> get($grpc.ServiceCall call, $10.GetUserSettingRequest request);
diff --git a/lib/viz-user-settings.pbjson.dart b/lib/viz-user-settings.pbjson.dart
index c1e5354..10ca340 100644
--- a/lib/viz-user-settings.pbjson.dart
+++ b/lib/viz-user-settings.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-user-settings.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
diff --git a/lib/viz-view.pb.dart b/lib/viz-view.pb.dart
index 6906e9b..980657b 100644
--- a/lib/viz-view.pb.dart
+++ b/lib/viz-view.pb.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-view.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -16,6 +16,8 @@ import 'package:protobuf/protobuf.dart' as $pb;
 import 'core/shared.pb.dart' as $16;
 import 'viz-view.pbenum.dart';
 
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
 export 'viz-view.pbenum.dart';
 
 class View extends $pb.GeneratedMessage {
@@ -111,7 +113,7 @@ class View extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasViewID() => $_has(0);
   @$pb.TagNumber(1)
-  void clearViewID() => clearField(1);
+  void clearViewID() => $_clearField(1);
 
   /// Identifier of the Project
   @$pb.TagNumber(2)
@@ -121,7 +123,7 @@ class View extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasProjectID() => $_has(1);
   @$pb.TagNumber(2)
-  void clearProjectID() => clearField(2);
+  void clearProjectID() => $_clearField(2);
 
   /// Identifier of the screen
   @$pb.TagNumber(3)
@@ -131,7 +133,7 @@ class View extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasScreenID() => $_has(2);
   @$pb.TagNumber(3)
-  void clearScreenID() => clearField(3);
+  void clearScreenID() => $_clearField(3);
 
   /// Identifier of the user who created
   @$pb.TagNumber(4)
@@ -141,7 +143,7 @@ class View extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasCreateUserID() => $_has(3);
   @$pb.TagNumber(4)
-  void clearCreateUserID() => clearField(4);
+  void clearCreateUserID() => $_clearField(4);
 
   /// Identifier of the user who did last update
   @$pb.TagNumber(5)
@@ -151,7 +153,7 @@ class View extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $core.bool hasUpdateUserID() => $_has(4);
   @$pb.TagNumber(5)
-  void clearUpdateUserID() => clearField(5);
+  void clearUpdateUserID() => $_clearField(5);
 
   /// Date of creation in ISO 8601 format with time zone (accepted tzd formats: [+01:00, -01:00, Z]
   @$pb.TagNumber(6)
@@ -161,7 +163,7 @@ class View extends $pb.GeneratedMessage {
   @$pb.TagNumber(6)
   $core.bool hasCreateDateTime() => $_has(5);
   @$pb.TagNumber(6)
-  void clearCreateDateTime() => clearField(6);
+  void clearCreateDateTime() => $_clearField(6);
 
   /// Date of last update in ISO 8601 format with time zone (accepted tzd formats: [+01:00, -01:00, Z]
   @$pb.TagNumber(7)
@@ -171,7 +173,7 @@ class View extends $pb.GeneratedMessage {
   @$pb.TagNumber(7)
   $core.bool hasUpdateDateTime() => $_has(6);
   @$pb.TagNumber(7)
-  void clearUpdateDateTime() => clearField(7);
+  void clearUpdateDateTime() => $_clearField(7);
 
   /// Content of the View
   @$pb.TagNumber(10)
@@ -181,7 +183,7 @@ class View extends $pb.GeneratedMessage {
   @$pb.TagNumber(10)
   $core.bool hasPayload() => $_has(7);
   @$pb.TagNumber(10)
-  void clearPayload() => clearField(10);
+  void clearPayload() => $_clearField(10);
 
   /// Visibility of the View
   @$pb.TagNumber(12)
@@ -191,7 +193,7 @@ class View extends $pb.GeneratedMessage {
   @$pb.TagNumber(12)
   $core.bool hasIsPrivate() => $_has(8);
   @$pb.TagNumber(12)
-  void clearIsPrivate() => clearField(12);
+  void clearIsPrivate() => $_clearField(12);
 
   /// Name of the View
   @$pb.TagNumber(13)
@@ -201,7 +203,7 @@ class View extends $pb.GeneratedMessage {
   @$pb.TagNumber(13)
   $core.bool hasName() => $_has(9);
   @$pb.TagNumber(13)
-  void clearName() => clearField(13);
+  void clearName() => $_clearField(13);
 }
 
 class ComposedUserView extends $pb.GeneratedMessage {
@@ -282,7 +284,7 @@ class ComposedUserView extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasViewID() => $_has(0);
   @$pb.TagNumber(1)
-  void clearViewID() => clearField(1);
+  void clearViewID() => $_clearField(1);
 
   /// Name of the View
   @$pb.TagNumber(2)
@@ -292,7 +294,7 @@ class ComposedUserView extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasName() => $_has(1);
   @$pb.TagNumber(2)
-  void clearName() => clearField(2);
+  void clearName() => $_clearField(2);
 
   /// Identifier of the User
   @$pb.TagNumber(3)
@@ -302,7 +304,7 @@ class ComposedUserView extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasUserID() => $_has(2);
   @$pb.TagNumber(3)
-  void clearUserID() => clearField(3);
+  void clearUserID() => $_clearField(3);
 
   /// Identifier of the Project
   @$pb.TagNumber(4)
@@ -312,7 +314,7 @@ class ComposedUserView extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasProjectID() => $_has(3);
   @$pb.TagNumber(4)
-  void clearProjectID() => clearField(4);
+  void clearProjectID() => $_clearField(4);
 
   /// Identifier of the Screen
   @$pb.TagNumber(5)
@@ -322,7 +324,7 @@ class ComposedUserView extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $core.bool hasScreenID() => $_has(4);
   @$pb.TagNumber(5)
-  void clearScreenID() => clearField(5);
+  void clearScreenID() => $_clearField(5);
 
   /// Content of the View
   @$pb.TagNumber(6)
@@ -332,7 +334,7 @@ class ComposedUserView extends $pb.GeneratedMessage {
   @$pb.TagNumber(6)
   $core.bool hasPayload() => $_has(5);
   @$pb.TagNumber(6)
-  void clearPayload() => clearField(6);
+  void clearPayload() => $_clearField(6);
 
   /// Visibility of the View
   @$pb.TagNumber(9)
@@ -342,7 +344,7 @@ class ComposedUserView extends $pb.GeneratedMessage {
   @$pb.TagNumber(9)
   $core.bool hasIsPrivate() => $_has(6);
   @$pb.TagNumber(9)
-  void clearIsPrivate() => clearField(9);
+  void clearIsPrivate() => $_clearField(9);
 }
 
 /// IDs of the View
@@ -394,11 +396,11 @@ class GetViewRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $16.RequestProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($16.RequestProjectHeader v) { setField(1, v); }
+  set header($16.RequestProjectHeader v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
-  void clearHeader() => clearField(1);
+  void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
   $16.RequestProjectHeader ensureHeader() => $_ensure(0);
 
@@ -410,7 +412,7 @@ class GetViewRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasViewID() => $_has(1);
   @$pb.TagNumber(2)
-  void clearViewID() => clearField(2);
+  void clearViewID() => $_clearField(2);
 }
 
 /// All information about the View
@@ -457,11 +459,11 @@ class GetViewResult extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   ComposedUserView get result => $_getN(0);
   @$pb.TagNumber(1)
-  set result(ComposedUserView v) { setField(1, v); }
+  set result(ComposedUserView v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasResult() => $_has(0);
   @$pb.TagNumber(1)
-  void clearResult() => clearField(1);
+  void clearResult() => $_clearField(1);
   @$pb.TagNumber(1)
   ComposedUserView ensureResult() => $_ensure(0);
 }
@@ -530,11 +532,11 @@ class CreateViewRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $16.RequestProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($16.RequestProjectHeader v) { setField(1, v); }
+  set header($16.RequestProjectHeader v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
-  void clearHeader() => clearField(1);
+  void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
   $16.RequestProjectHeader ensureHeader() => $_ensure(0);
 
@@ -546,7 +548,7 @@ class CreateViewRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasName() => $_has(1);
   @$pb.TagNumber(2)
-  void clearName() => clearField(2);
+  void clearName() => $_clearField(2);
 
   /// Identifier of the Screen
   @$pb.TagNumber(3)
@@ -556,7 +558,7 @@ class CreateViewRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasScreenID() => $_has(2);
   @$pb.TagNumber(3)
-  void clearScreenID() => clearField(3);
+  void clearScreenID() => $_clearField(3);
 
   /// Content of the View
   @$pb.TagNumber(5)
@@ -566,7 +568,7 @@ class CreateViewRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $core.bool hasPayload() => $_has(3);
   @$pb.TagNumber(5)
-  void clearPayload() => clearField(5);
+  void clearPayload() => $_clearField(5);
 
   /// Visibility of the View
   @$pb.TagNumber(7)
@@ -576,7 +578,7 @@ class CreateViewRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(7)
   $core.bool hasIsPrivate() => $_has(4);
   @$pb.TagNumber(7)
-  void clearIsPrivate() => clearField(7);
+  void clearIsPrivate() => $_clearField(7);
 }
 
 /// ID of the created View
@@ -628,7 +630,7 @@ class CreateViewResult extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasViewID() => $_has(0);
   @$pb.TagNumber(1)
-  void clearViewID() => clearField(1);
+  void clearViewID() => $_clearField(1);
 }
 
 /// Information that needs to be updated
@@ -700,11 +702,11 @@ class UpdateViewRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $16.RequestProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($16.RequestProjectHeader v) { setField(1, v); }
+  set header($16.RequestProjectHeader v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
-  void clearHeader() => clearField(1);
+  void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
   $16.RequestProjectHeader ensureHeader() => $_ensure(0);
 
@@ -716,7 +718,7 @@ class UpdateViewRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasViewID() => $_has(1);
   @$pb.TagNumber(2)
-  void clearViewID() => clearField(2);
+  void clearViewID() => $_clearField(2);
 
   /// Name of the View
   @$pb.TagNumber(3)
@@ -726,7 +728,7 @@ class UpdateViewRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $core.bool hasName() => $_has(2);
   @$pb.TagNumber(3)
-  void clearName() => clearField(3);
+  void clearName() => $_clearField(3);
 
   /// Identifier of the Screen
   @$pb.TagNumber(4)
@@ -736,7 +738,7 @@ class UpdateViewRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasScreenID() => $_has(3);
   @$pb.TagNumber(4)
-  void clearScreenID() => clearField(4);
+  void clearScreenID() => $_clearField(4);
 
   /// Content of the View
   @$pb.TagNumber(6)
@@ -746,7 +748,7 @@ class UpdateViewRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(6)
   $core.bool hasPayload() => $_has(4);
   @$pb.TagNumber(6)
-  void clearPayload() => clearField(6);
+  void clearPayload() => $_clearField(6);
 
   /// Visibility of the View
   @$pb.TagNumber(8)
@@ -756,7 +758,7 @@ class UpdateViewRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(8)
   $core.bool hasIsPrivate() => $_has(5);
   @$pb.TagNumber(8)
-  void clearIsPrivate() => clearField(8);
+  void clearIsPrivate() => $_clearField(8);
 }
 
 /// Updated View ID
@@ -808,7 +810,7 @@ class UpdateViewResult extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasViewID() => $_has(0);
   @$pb.TagNumber(1)
-  void clearViewID() => clearField(1);
+  void clearViewID() => $_clearField(1);
 }
 
 /// IDs of the View to be deleted
@@ -860,11 +862,11 @@ class DeleteViewRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $16.RequestProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($16.RequestProjectHeader v) { setField(1, v); }
+  set header($16.RequestProjectHeader v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
-  void clearHeader() => clearField(1);
+  void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
   $16.RequestProjectHeader ensureHeader() => $_ensure(0);
 
@@ -876,7 +878,7 @@ class DeleteViewRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasViewID() => $_has(1);
   @$pb.TagNumber(2)
-  void clearViewID() => clearField(2);
+  void clearViewID() => $_clearField(2);
 }
 
 class DeleteViewResult extends $pb.GeneratedMessage {
@@ -959,11 +961,11 @@ class ListViewRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $16.RequestProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($16.RequestProjectHeader v) { setField(1, v); }
+  set header($16.RequestProjectHeader v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
-  void clearHeader() => clearField(1);
+  void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
   $16.RequestProjectHeader ensureHeader() => $_ensure(0);
 
@@ -975,7 +977,7 @@ class ListViewRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasScreenID() => $_has(1);
   @$pb.TagNumber(2)
-  void clearScreenID() => clearField(2);
+  void clearScreenID() => $_clearField(2);
 }
 
 /// List of Views
@@ -1021,7 +1023,7 @@ class ListViewResult extends $pb.GeneratedMessage {
 
   /// All information in a View
   @$pb.TagNumber(1)
-  $core.List<ComposedUserView> get results => $_getList(0);
+  $pb.PbList<ComposedUserView> get results => $_getList(0);
 }
 
 class DeleteViewsForProjectRequest extends $pb.GeneratedMessage {
@@ -1072,7 +1074,7 @@ class DeleteViewsForProjectRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasProjectID() => $_has(0);
   @$pb.TagNumber(1)
-  void clearProjectID() => clearField(1);
+  void clearProjectID() => $_clearField(1);
 }
 
 class DeleteViewsForProjectResult extends $pb.GeneratedMessage {
@@ -1109,7 +1111,7 @@ class DeleteViewsForProjectResult extends $pb.GeneratedMessage {
 
 class TranslationMap extends $pb.GeneratedMessage {
   factory TranslationMap({
-    $core.Map<$core.String, $core.String>? data,
+    $pb.PbMap<$core.String, $core.String>? data,
   }) {
     final $result = create();
     if (data != null) {
@@ -1148,13 +1150,14 @@ class TranslationMap extends $pb.GeneratedMessage {
   static TranslationMap? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $core.Map<$core.String, $core.String> get data => $_getMap(0);
+  $pb.PbMap<$core.String, $core.String> get data => $_getMap(0);
 }
 
 class ExtractColumnFormat extends $pb.GeneratedMessage {
   factory ExtractColumnFormat({
     ExtractColumnFormat_type? type,
     $core.String? format,
+    $core.bool? time,
   }) {
     final $result = create();
     if (type != null) {
@@ -1163,6 +1166,9 @@ class ExtractColumnFormat extends $pb.GeneratedMessage {
     if (format != null) {
       $result.format = format;
     }
+    if (time != null) {
+      $result.time = time;
+    }
     return $result;
   }
   ExtractColumnFormat._() : super();
@@ -1172,6 +1178,7 @@ class ExtractColumnFormat extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ExtractColumnFormat', package: const $pb.PackageName(_omitMessageNames ? '' : 'vizapi'), createEmptyInstance: create)
     ..e<ExtractColumnFormat_type>(1, _omitFieldNames ? '' : 'Type', $pb.PbFieldType.OE, protoName: 'Type', defaultOrMaker: ExtractColumnFormat_type.UNKNOWN, valueOf: ExtractColumnFormat_type.valueOf, enumValues: ExtractColumnFormat_type.values)
     ..aOS(2, _omitFieldNames ? '' : 'Format', protoName: 'Format')
+    ..aOB(3, _omitFieldNames ? '' : 'Time', protoName: 'Time')
     ..hasRequiredFields = false
   ;
 
@@ -1199,11 +1206,11 @@ class ExtractColumnFormat extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   ExtractColumnFormat_type get type => $_getN(0);
   @$pb.TagNumber(1)
-  set type(ExtractColumnFormat_type v) { setField(1, v); }
+  set type(ExtractColumnFormat_type v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasType() => $_has(0);
   @$pb.TagNumber(1)
-  void clearType() => clearField(1);
+  void clearType() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get format => $_getSZ(1);
@@ -1212,7 +1219,16 @@ class ExtractColumnFormat extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasFormat() => $_has(1);
   @$pb.TagNumber(2)
-  void clearFormat() => clearField(2);
+  void clearFormat() => $_clearField(2);
+
+  @$pb.TagNumber(3)
+  $core.bool get time => $_getBF(2);
+  @$pb.TagNumber(3)
+  set time($core.bool v) { $_setBool(2, v); }
+  @$pb.TagNumber(3)
+  $core.bool hasTime() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearTime() => $_clearField(3);
 }
 
 class ExtractRequest extends $pb.GeneratedMessage {
@@ -1222,9 +1238,12 @@ class ExtractRequest extends $pb.GeneratedMessage {
     $core.Iterable<$16.BlockFilter>? blockFilters,
     $core.String? listSeparator,
     $core.String? decimalSeparator,
-    $core.Map<$core.String, TranslationMap>? columnTranslationMaps,
-    $core.Map<$core.int, ExtractColumnFormat>? columnFormats,
+    $pb.PbMap<$core.String, TranslationMap>? columnTranslationMaps,
+    $pb.PbMap<$core.int, ExtractColumnFormat>? columnFormats,
     $core.String? targetTimeZone,
+    $core.String? dateFormat,
+    $core.String? numberFormat,
+    TimeFormat? timeFormat,
   }) {
     final $result = create();
     if (header != null) {
@@ -1251,6 +1270,15 @@ class ExtractRequest extends $pb.GeneratedMessage {
     if (targetTimeZone != null) {
       $result.targetTimeZone = targetTimeZone;
     }
+    if (dateFormat != null) {
+      $result.dateFormat = dateFormat;
+    }
+    if (numberFormat != null) {
+      $result.numberFormat = numberFormat;
+    }
+    if (timeFormat != null) {
+      $result.timeFormat = timeFormat;
+    }
     return $result;
   }
   ExtractRequest._() : super();
@@ -1266,6 +1294,9 @@ class ExtractRequest extends $pb.GeneratedMessage {
     ..m<$core.String, TranslationMap>(8, _omitFieldNames ? '' : 'ColumnTranslationMaps', protoName: 'ColumnTranslationMaps', entryClassName: 'ExtractRequest.ColumnTranslationMapsEntry', keyFieldType: $pb.PbFieldType.OS, valueFieldType: $pb.PbFieldType.OM, valueCreator: TranslationMap.create, valueDefaultOrMaker: TranslationMap.getDefault, packageName: const $pb.PackageName('vizapi'))
     ..m<$core.int, ExtractColumnFormat>(9, _omitFieldNames ? '' : 'ColumnFormats', protoName: 'ColumnFormats', entryClassName: 'ExtractRequest.ColumnFormatsEntry', keyFieldType: $pb.PbFieldType.O3, valueFieldType: $pb.PbFieldType.OM, valueCreator: ExtractColumnFormat.create, valueDefaultOrMaker: ExtractColumnFormat.getDefault, packageName: const $pb.PackageName('vizapi'))
     ..aOS(10, _omitFieldNames ? '' : 'TargetTimeZone', protoName: 'TargetTimeZone')
+    ..aOS(11, _omitFieldNames ? '' : 'DateFormat', protoName: 'DateFormat')
+    ..aOS(12, _omitFieldNames ? '' : 'NumberFormat', protoName: 'NumberFormat')
+    ..e<TimeFormat>(13, _omitFieldNames ? '' : 'TimeFormat', $pb.PbFieldType.OE, protoName: 'TimeFormat', defaultOrMaker: TimeFormat.H12, valueOf: TimeFormat.valueOf, enumValues: TimeFormat.values)
     ..hasRequiredFields = false
   ;
 
@@ -1293,11 +1324,11 @@ class ExtractRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $16.RequestProjectHeader get header => $_getN(0);
   @$pb.TagNumber(1)
-  set header($16.RequestProjectHeader v) { setField(1, v); }
+  set header($16.RequestProjectHeader v) { $_setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasHeader() => $_has(0);
   @$pb.TagNumber(1)
-  void clearHeader() => clearField(1);
+  void clearHeader() => $_clearField(1);
   @$pb.TagNumber(1)
   $16.RequestProjectHeader ensureHeader() => $_ensure(0);
 
@@ -1308,11 +1339,11 @@ class ExtractRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasViewID() => $_has(1);
   @$pb.TagNumber(2)
-  void clearViewID() => clearField(2);
+  void clearViewID() => $_clearField(2);
 
   /// BlockFilter structure for Find query
   @$pb.TagNumber(3)
-  $core.List<$16.BlockFilter> get blockFilters => $_getList(2);
+  $pb.PbList<$16.BlockFilter> get blockFilters => $_getList(2);
 
   /// Range filter structure for Find query
   @$pb.TagNumber(4)
@@ -1322,7 +1353,7 @@ class ExtractRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   $core.bool hasListSeparator() => $_has(3);
   @$pb.TagNumber(4)
-  void clearListSeparator() => clearField(4);
+  void clearListSeparator() => $_clearField(4);
 
   @$pb.TagNumber(5)
   $core.String get decimalSeparator => $_getSZ(4);
@@ -1331,13 +1362,13 @@ class ExtractRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(5)
   $core.bool hasDecimalSeparator() => $_has(4);
   @$pb.TagNumber(5)
-  void clearDecimalSeparator() => clearField(5);
+  void clearDecimalSeparator() => $_clearField(5);
 
   @$pb.TagNumber(8)
-  $core.Map<$core.String, TranslationMap> get columnTranslationMaps => $_getMap(5);
+  $pb.PbMap<$core.String, TranslationMap> get columnTranslationMaps => $_getMap(5);
 
   @$pb.TagNumber(9)
-  $core.Map<$core.int, ExtractColumnFormat> get columnFormats => $_getMap(6);
+  $pb.PbMap<$core.int, ExtractColumnFormat> get columnFormats => $_getMap(6);
 
   @$pb.TagNumber(10)
   $core.String get targetTimeZone => $_getSZ(7);
@@ -1346,7 +1377,34 @@ class ExtractRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(10)
   $core.bool hasTargetTimeZone() => $_has(7);
   @$pb.TagNumber(10)
-  void clearTargetTimeZone() => clearField(10);
+  void clearTargetTimeZone() => $_clearField(10);
+
+  @$pb.TagNumber(11)
+  $core.String get dateFormat => $_getSZ(8);
+  @$pb.TagNumber(11)
+  set dateFormat($core.String v) { $_setString(8, v); }
+  @$pb.TagNumber(11)
+  $core.bool hasDateFormat() => $_has(8);
+  @$pb.TagNumber(11)
+  void clearDateFormat() => $_clearField(11);
+
+  @$pb.TagNumber(12)
+  $core.String get numberFormat => $_getSZ(9);
+  @$pb.TagNumber(12)
+  set numberFormat($core.String v) { $_setString(9, v); }
+  @$pb.TagNumber(12)
+  $core.bool hasNumberFormat() => $_has(9);
+  @$pb.TagNumber(12)
+  void clearNumberFormat() => $_clearField(12);
+
+  @$pb.TagNumber(13)
+  TimeFormat get timeFormat => $_getN(10);
+  @$pb.TagNumber(13)
+  set timeFormat(TimeFormat v) { $_setField(13, v); }
+  @$pb.TagNumber(13)
+  $core.bool hasTimeFormat() => $_has(10);
+  @$pb.TagNumber(13)
+  void clearTimeFormat() => $_clearField(13);
 }
 
 class ExtractResult extends $pb.GeneratedMessage {
@@ -1401,7 +1459,7 @@ class ExtractResult extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $core.bool hasWorkflowID() => $_has(0);
   @$pb.TagNumber(1)
-  void clearWorkflowID() => clearField(1);
+  void clearWorkflowID() => $_clearField(1);
 
   @$pb.TagNumber(2)
   $core.String get runID => $_getSZ(1);
@@ -1410,7 +1468,7 @@ class ExtractResult extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   $core.bool hasRunID() => $_has(1);
   @$pb.TagNumber(2)
-  void clearRunID() => clearField(2);
+  void clearRunID() => $_clearField(2);
 }
 
 
diff --git a/lib/viz-view.pbenum.dart b/lib/viz-view.pbenum.dart
index bc4b7b0..238b42f 100644
--- a/lib/viz-view.pbenum.dart
+++ b/lib/viz-view.pbenum.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-view.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -13,21 +13,40 @@ import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
+class TimeFormat extends $pb.ProtobufEnum {
+  static const TimeFormat H12 = TimeFormat._(0, _omitEnumNames ? '' : 'H12');
+  static const TimeFormat H23 = TimeFormat._(1, _omitEnumNames ? '' : 'H23');
+  static const TimeFormat H24 = TimeFormat._(2, _omitEnumNames ? '' : 'H24');
+
+  static const $core.List<TimeFormat> values = <TimeFormat> [
+    H12,
+    H23,
+    H24,
+  ];
+
+  static final $core.Map<$core.int, TimeFormat> _byValue = $pb.ProtobufEnum.initByValue(values);
+  static TimeFormat? valueOf($core.int value) => _byValue[value];
+
+  const TimeFormat._(super.v, super.n);
+}
+
 class ExtractColumnFormat_type extends $pb.ProtobufEnum {
   static const ExtractColumnFormat_type UNKNOWN = ExtractColumnFormat_type._(0, _omitEnumNames ? '' : 'UNKNOWN');
   static const ExtractColumnFormat_type DATE = ExtractColumnFormat_type._(1, _omitEnumNames ? '' : 'DATE');
   static const ExtractColumnFormat_type SUFFIX = ExtractColumnFormat_type._(2, _omitEnumNames ? '' : 'SUFFIX');
+  static const ExtractColumnFormat_type NUMBER = ExtractColumnFormat_type._(3, _omitEnumNames ? '' : 'NUMBER');
 
   static const $core.List<ExtractColumnFormat_type> values = <ExtractColumnFormat_type> [
     UNKNOWN,
     DATE,
     SUFFIX,
+    NUMBER,
   ];
 
   static final $core.Map<$core.int, ExtractColumnFormat_type> _byValue = $pb.ProtobufEnum.initByValue(values);
   static ExtractColumnFormat_type? valueOf($core.int value) => _byValue[value];
 
-  const ExtractColumnFormat_type._($core.int v, $core.String n) : super(v, n);
+  const ExtractColumnFormat_type._(super.v, super.n);
 }
 
 
diff --git a/lib/viz-view.pbgrpc.dart b/lib/viz-view.pbgrpc.dart
index c4f34c4..52f02db 100644
--- a/lib/viz-view.pbgrpc.dart
+++ b/lib/viz-view.pbgrpc.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-view.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -141,32 +141,32 @@ abstract class ViewServiceBase extends $grpc.Service {
         ($1.ExtractResult value) => value.writeToBuffer()));
   }
 
-  $async.Future<$1.GetViewResult> get_Pre($grpc.ServiceCall call, $async.Future<$1.GetViewRequest> request) async {
-    return get(call, await request);
+  $async.Future<$1.GetViewResult> get_Pre($grpc.ServiceCall $call, $async.Future<$1.GetViewRequest> $request) async {
+    return get($call, await $request);
   }
 
-  $async.Future<$1.CreateViewResult> create_Pre($grpc.ServiceCall call, $async.Future<$1.CreateViewRequest> request) async {
-    return create(call, await request);
+  $async.Future<$1.CreateViewResult> create_Pre($grpc.ServiceCall $call, $async.Future<$1.CreateViewRequest> $request) async {
+    return create($call, await $request);
   }
 
-  $async.Future<$1.UpdateViewResult> update_Pre($grpc.ServiceCall call, $async.Future<$1.UpdateViewRequest> request) async {
-    return update(call, await request);
+  $async.Future<$1.UpdateViewResult> update_Pre($grpc.ServiceCall $call, $async.Future<$1.UpdateViewRequest> $request) async {
+    return update($call, await $request);
   }
 
-  $async.Future<$1.DeleteViewResult> delete_Pre($grpc.ServiceCall call, $async.Future<$1.DeleteViewRequest> request) async {
-    return delete(call, await request);
+  $async.Future<$1.DeleteViewResult> delete_Pre($grpc.ServiceCall $call, $async.Future<$1.DeleteViewRequest> $request) async {
+    return delete($call, await $request);
   }
 
-  $async.Future<$1.ListViewResult> list_Pre($grpc.ServiceCall call, $async.Future<$1.ListViewRequest> request) async {
-    return list(call, await request);
+  $async.Future<$1.ListViewResult> list_Pre($grpc.ServiceCall $call, $async.Future<$1.ListViewRequest> $request) async {
+    return list($call, await $request);
   }
 
-  $async.Future<$1.DeleteViewsForProjectResult> deleteViewsForProject_Pre($grpc.ServiceCall call, $async.Future<$1.DeleteViewsForProjectRequest> request) async {
-    return deleteViewsForProject(call, await request);
+  $async.Future<$1.DeleteViewsForProjectResult> deleteViewsForProject_Pre($grpc.ServiceCall $call, $async.Future<$1.DeleteViewsForProjectRequest> $request) async {
+    return deleteViewsForProject($call, await $request);
   }
 
-  $async.Future<$1.ExtractResult> extract_Pre($grpc.ServiceCall call, $async.Future<$1.ExtractRequest> request) async {
-    return extract(call, await request);
+  $async.Future<$1.ExtractResult> extract_Pre($grpc.ServiceCall $call, $async.Future<$1.ExtractRequest> $request) async {
+    return extract($call, await $request);
   }
 
   $async.Future<$1.GetViewResult> get($grpc.ServiceCall call, $1.GetViewRequest request);
diff --git a/lib/viz-view.pbjson.dart b/lib/viz-view.pbjson.dart
index 5bff25e..d4b4d4a 100644
--- a/lib/viz-view.pbjson.dart
+++ b/lib/viz-view.pbjson.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: viz-view.proto
 //
-// @dart = 2.12
+// @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
 // ignore_for_file: constant_identifier_names, library_prefixes
@@ -13,6 +13,20 @@ import 'dart:convert' as $convert;
 import 'dart:core' as $core;
 import 'dart:typed_data' as $typed_data;
 
+@$core.Deprecated('Use timeFormatDescriptor instead')
+const TimeFormat$json = {
+  '1': 'TimeFormat',
+  '2': [
+    {'1': 'H12', '2': 0},
+    {'1': 'H23', '2': 1},
+    {'1': 'H24', '2': 2},
+  ],
+};
+
+/// Descriptor for `TimeFormat`. Decode as a `google.protobuf.EnumDescriptorProto`.
+final $typed_data.Uint8List timeFormatDescriptor = $convert.base64Decode(
+    'CgpUaW1lRm9ybWF0EgcKA0gxMhAAEgcKA0gyMxABEgcKA0gyNBAC');
+
 @$core.Deprecated('Use viewDescriptor instead')
 const View$json = {
   '1': 'View',
@@ -295,7 +309,8 @@ const ExtractColumnFormat$json = {
   '1': 'ExtractColumnFormat',
   '2': [
     {'1': 'Type', '3': 1, '4': 1, '5': 14, '6': '.vizapi.ExtractColumnFormat.type', '10': 'Type'},
-    {'1': 'Format', '3': 2, '4': 1, '5': 9, '8': {}, '10': 'Format'},
+    {'1': 'Format', '3': 2, '4': 1, '5': 9, '10': 'Format'},
+    {'1': 'Time', '3': 3, '4': 1, '5': 8, '10': 'Time'},
   ],
   '4': [ExtractColumnFormat_type$json],
 };
@@ -307,14 +322,16 @@ const ExtractColumnFormat_type$json = {
     {'1': 'UNKNOWN', '2': 0},
     {'1': 'DATE', '2': 1},
     {'1': 'SUFFIX', '2': 2},
+    {'1': 'NUMBER', '2': 3},
   ],
 };
 
 /// Descriptor for `ExtractColumnFormat`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List extractColumnFormatDescriptor = $convert.base64Decode(
     'ChNFeHRyYWN0Q29sdW1uRm9ybWF0EjQKBFR5cGUYASABKA4yIC52aXphcGkuRXh0cmFjdENvbH'
-    'VtbkZvcm1hdC50eXBlUgRUeXBlEh8KBkZvcm1hdBgCIAEoCUIH+kIEcgIQAVIGRm9ybWF0IikK'
-    'BHR5cGUSCwoHVU5LTk9XThAAEggKBERBVEUQARIKCgZTVUZGSVgQAg==');
+    'VtbkZvcm1hdC50eXBlUgRUeXBlEhYKBkZvcm1hdBgCIAEoCVIGRm9ybWF0EhIKBFRpbWUYAyAB'
+    'KAhSBFRpbWUiNQoEdHlwZRILCgdVTktOT1dOEAASCAoEREFURRABEgoKBlNVRkZJWBACEgoKBk'
+    '5VTUJFUhAD');
 
 @$core.Deprecated('Use extractRequestDescriptor instead')
 const ExtractRequest$json = {
@@ -328,6 +345,9 @@ const ExtractRequest$json = {
     {'1': 'ColumnTranslationMaps', '3': 8, '4': 3, '5': 11, '6': '.vizapi.ExtractRequest.ColumnTranslationMapsEntry', '10': 'ColumnTranslationMaps'},
     {'1': 'ColumnFormats', '3': 9, '4': 3, '5': 11, '6': '.vizapi.ExtractRequest.ColumnFormatsEntry', '10': 'ColumnFormats'},
     {'1': 'TargetTimeZone', '3': 10, '4': 1, '5': 9, '8': {}, '10': 'TargetTimeZone'},
+    {'1': 'DateFormat', '3': 11, '4': 1, '5': 9, '8': {}, '10': 'DateFormat'},
+    {'1': 'NumberFormat', '3': 12, '4': 1, '5': 9, '8': {}, '10': 'NumberFormat'},
+    {'1': 'TimeFormat', '3': 13, '4': 1, '5': 14, '6': '.vizapi.TimeFormat', '8': {}, '10': 'TimeFormat'},
   ],
   '3': [ExtractRequest_ColumnTranslationMapsEntry$json, ExtractRequest_ColumnFormatsEntry$json],
   '7': {},
@@ -368,12 +388,18 @@ final $typed_data.Uint8List extractRequestDescriptor = $convert.base64Decode(
     'YXRzRW50cnlSDUNvbHVtbkZvcm1hdHMSsAEKDlRhcmdldFRpbWVab25lGAogASgJQocBkkF6Mm'
     'hUYXJnZXQgdXNlciB0aW1lIHpvbmUgIDxhIGhyZWY9J2h0dHBzOi8vZW4ud2lraXBlZGlhLm9y'
     'Zy93aWtpL0xpc3Rfb2ZfdHpfZGF0YWJhc2VfdGltZV96b25lcyc+Zm9ybWF0PC9hPkoOIkV1cm'
-    '9wZS9QYXJpcyL6QgdyBRAB4AEBUg5UYXJnZXRUaW1lWm9uZRpgChpDb2x1bW5UcmFuc2xhdGlv'
-    'bk1hcHNFbnRyeRIQCgNrZXkYASABKAlSA2tleRIsCgV2YWx1ZRgCIAEoCzIWLnZpemFwaS5Ucm'
-    'Fuc2xhdGlvbk1hcFIFdmFsdWU6AjgBGl0KEkNvbHVtbkZvcm1hdHNFbnRyeRIQCgNrZXkYASAB'
-    'KAVSA2tleRIxCgV2YWx1ZRgCIAEoCzIbLnZpemFwaS5FeHRyYWN0Q29sdW1uRm9ybWF0UgV2YW'
-    'x1ZToCOAE6OpJBNwo10gEGSGVhZGVy0gEGVmlld0lE0gENTGlzdFNlcGFyYXRvctIBEERlY2lt'
-    'YWxTZXBhcmF0b3I=');
+    '9wZS9QYXJpcyL6QgdyBRAB4AEBUg5UYXJnZXRUaW1lWm9uZRKHAQoKRGF0ZUZvcm1hdBgLIAEo'
+    'CUJnkkFkMllMYW5ndWFnZSBjb2RlIHRvIGZvcm1hdCBkYXRlcyAgPGEgaHJlZj0naHR0cHM6Ly'
+    '9lbi53aWtpcGVkaWEub3JnL3dpa2kvSVNPXzYzOSc+Zm9ybWF0PC9hPkoHImVuLVVTIlIKRGF0'
+    'ZUZvcm1hdBKMAQoMTnVtYmVyRm9ybWF0GAwgASgJQmiSQWUyWkxhbmd1YWdlIGNvZGUgdG8gZm'
+    '9ybWF0IG51bWJlcnMgPGEgaHJlZj0naHR0cHM6Ly9lbi53aWtpcGVkaWEub3JnL3dpa2kvSVNP'
+    'XzYzOSc+Zm9ybWF0PC9hPkoHImVuLVVTIlIMTnVtYmVyRm9ybWF0Ek8KClRpbWVGb3JtYXQYDS'
+    'ABKA4yEi52aXphcGkuVGltZUZvcm1hdEIbkkEYMhZIb3VyIGNsb2NrIHRpbWUgZm9ybWF0UgpU'
+    'aW1lRm9ybWF0GmAKGkNvbHVtblRyYW5zbGF0aW9uTWFwc0VudHJ5EhAKA2tleRgBIAEoCVIDa2'
+    'V5EiwKBXZhbHVlGAIgASgLMhYudml6YXBpLlRyYW5zbGF0aW9uTWFwUgV2YWx1ZToCOAEaXQoS'
+    'Q29sdW1uRm9ybWF0c0VudHJ5EhAKA2tleRgBIAEoBVIDa2V5EjEKBXZhbHVlGAIgASgLMhsudm'
+    'l6YXBpLkV4dHJhY3RDb2x1bW5Gb3JtYXRSBXZhbHVlOgI4ATo6kkE3CjXSAQZIZWFkZXLSAQZW'
+    'aWV3SUTSAQ1MaXN0U2VwYXJhdG9y0gEQRGVjaW1hbFNlcGFyYXRvcg==');
 
 @$core.Deprecated('Use extractResultDescriptor instead')
 const ExtractResult$json = {
diff --git a/pubspec.lock b/pubspec.lock
index a510ce9..23fbc9b 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -61,18 +61,18 @@ packages:
     dependency: transitive
     description:
       name: googleapis_auth
-      sha256: befd71383a955535060acde8792e7efc11d2fccd03dd1d3ec434e85b68775938
+      sha256: b81fe352cc4a330b3710d2b7ad258d9bcef6f909bb759b306bf42973a7d046db
       url: "https://pub.dev"
     source: hosted
-    version: "1.6.0"
+    version: "2.0.0"
   grpc:
     dependency: "direct main"
     description:
       name: grpc
-      sha256: "5b99b7a420937d4361ece68b798c9af8e04b5bc128a7859f2a4be87427694813"
+      sha256: "30e1edae6846b163a64f6d8716e3443980fe1f7d2d1f086f011d24ea186f2582"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.1"
+    version: "4.0.4"
   http:
     dependency: transitive
     description:
@@ -162,4 +162,4 @@ packages:
     source: hosted
     version: "1.1.1"
 sdks:
-  dart: ">=3.5.0 <4.0.0"
+  dart: ">=3.6.0 <4.0.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index c7606dd..928ff97 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: dart_viz_sdk
 description: dart libs from visibility model proto files
-version: 1.10.0-SNAPSHOT-250318155050
+version: 1.10.0-SNAPSHOT-250403082301
 homepage: ''
 publish_to: ''
 repository: ''