diff --git a/lib/rethinkdb_dart.dart b/lib/rethinkdb_dart.dart
index c35503e..e973efe 100644
--- a/lib/rethinkdb_dart.dart
+++ b/lib/rethinkdb_dart.dart
@@ -7,7 +7,7 @@ import 'src/generated/ql2.pb.dart' as p;
 import 'dart:convert';
 import 'dart:collection';
 import 'package:crypto/crypto.dart';
-import 'package:pbkdf2_dart/pbkdf2_dart.dart';
+import 'package:pbkdf2ns/pbkdf2ns.dart';
 import 'dart:math' as math;
 
 part 'src/ast.dart';
@@ -16,7 +16,7 @@ part 'src/net.dart';
 part 'src/cursor.dart';
 
 class AddFunction {
-  RqlQuery _rqlQuery;
+  final RqlQuery? _rqlQuery;
 
   AddFunction([this._rqlQuery]);
 
@@ -26,13 +26,13 @@ class AddFunction {
     } else if (obj is Args) {
       return Add([obj]);
     } else {
-      throw RqlDriverError("Called add with too few values");
+      throw RqlDriverError('Called add with too few values');
     }
   }
 
   @override
   dynamic noSuchMethod(Invocation invocation) {
-    List positionalArguments = [];
+    var positionalArguments = [];
     if (_rqlQuery != null) {
       positionalArguments.add(_rqlQuery);
     }
@@ -43,7 +43,7 @@ class AddFunction {
 
 /// computes logical 'and' of two or more values
 class AndFunction {
-  RqlQuery _rqlQuery;
+  final RqlQuery? _rqlQuery;
 
   AndFunction([this._rqlQuery]);
 
@@ -51,13 +51,13 @@ class AndFunction {
     if (_rqlQuery != null) {
       return And([_rqlQuery, obj]);
     } else {
-      throw RqlDriverError("Called and with too few values");
+      throw RqlDriverError('Called and with too few values');
     }
   }
 
   @override
   dynamic noSuchMethod(Invocation invocation) {
-    List positionalArguments = [];
+    var positionalArguments = [];
     if (_rqlQuery != null) {
       positionalArguments.add(_rqlQuery);
     }
@@ -80,7 +80,7 @@ class BranchFunction {
 }
 
 class DivFunction {
-  RqlQuery _rqlQuery;
+  final RqlQuery? _rqlQuery;
 
   DivFunction([this._rqlQuery]);
 
@@ -90,13 +90,13 @@ class DivFunction {
     } else if (number is Args) {
       return Div([number]);
     } else {
-      throw RqlDriverError("Called div with too few values");
+      throw RqlDriverError('Called div with too few values');
     }
   }
 
   @override
   dynamic noSuchMethod(Invocation invocation) {
-    List positionalArguments = [];
+    var positionalArguments = [];
     if (_rqlQuery != null) {
       positionalArguments.add(_rqlQuery);
     }
@@ -106,7 +106,7 @@ class DivFunction {
 }
 
 class EqFunction {
-  RqlQuery _rqlQuery;
+  final RqlQuery? _rqlQuery;
 
   EqFunction([this._rqlQuery]);
 
@@ -116,13 +116,13 @@ class EqFunction {
     } else if (value is Args) {
       return Eq([value]);
     } else {
-      throw RqlDriverError("Called eq with too few values");
+      throw RqlDriverError('Called eq with too few values');
     }
   }
 
   @override
   dynamic noSuchMethod(Invocation invocation) {
-    List positionalArguments = [];
+    var positionalArguments = [];
     if (_rqlQuery != null) {
       positionalArguments.add(_rqlQuery);
     }
@@ -132,7 +132,7 @@ class EqFunction {
 }
 
 class GeFunction {
-  RqlQuery _rqlQuery;
+  final RqlQuery? _rqlQuery;
 
   GeFunction([this._rqlQuery]);
 
@@ -142,13 +142,13 @@ class GeFunction {
     } else if (number is Args) {
       return Ge([number]);
     } else {
-      throw RqlDriverError("Called ge with too few values");
+      throw RqlDriverError('Called ge with too few values');
     }
   }
 
   @override
   dynamic noSuchMethod(Invocation invocation) {
-    List positionalArguments = [];
+    var positionalArguments = [];
     if (_rqlQuery != null) {
       positionalArguments.add(_rqlQuery);
     }
@@ -158,7 +158,7 @@ class GeFunction {
 }
 
 class GtFunction {
-  RqlQuery _rqlQuery;
+  final RqlQuery? _rqlQuery;
 
   GtFunction([this._rqlQuery]);
 
@@ -168,13 +168,13 @@ class GtFunction {
     } else if (number is Args) {
       return Gt([number]);
     } else {
-      throw RqlDriverError("Called gt with too few values");
+      throw RqlDriverError('Called gt with too few values');
     }
   }
 
   @override
   dynamic noSuchMethod(Invocation invocation) {
-    List positionalArguments = [];
+    var positionalArguments = [];
     if (_rqlQuery != null) {
       positionalArguments.add(_rqlQuery);
     }
@@ -184,7 +184,7 @@ class GtFunction {
 }
 
 class LeFunction {
-  RqlQuery _rqlQuery;
+  final RqlQuery? _rqlQuery;
 
   LeFunction([this._rqlQuery]);
 
@@ -194,13 +194,13 @@ class LeFunction {
     } else if (number is Args) {
       return Le([number]);
     } else {
-      throw RqlDriverError("Called le with too few values");
+      throw RqlDriverError('Called le with too few values');
     }
   }
 
   @override
   dynamic noSuchMethod(Invocation invocation) {
-    List positionalArguments = [];
+    var positionalArguments = [];
     if (_rqlQuery != null) {
       positionalArguments.add(_rqlQuery);
     }
@@ -222,7 +222,7 @@ class LineFunction {
 }
 
 class LtFunction {
-  RqlQuery _rqlQuery;
+  final RqlQuery? _rqlQuery;
 
   LtFunction([this._rqlQuery]);
 
@@ -232,13 +232,13 @@ class LtFunction {
     } else if (number is Args) {
       return Lt([number]);
     } else {
-      throw RqlDriverError("Called lt with too few values");
+      throw RqlDriverError('Called lt with too few values');
     }
   }
 
   @override
   dynamic noSuchMethod(Invocation invocation) {
-    List positionalArguments = [];
+    var positionalArguments = [];
     if (_rqlQuery != null) {
       positionalArguments.add(_rqlQuery);
     }
@@ -257,13 +257,13 @@ class MapFunction {
 
   @override
   dynamic noSuchMethod(Invocation invocation) {
-    List args = List.from(invocation.positionalArguments);
+    var args = List.from(invocation.positionalArguments);
     return RqlMap(args.sublist(0, args.length - 1), args.last);
   }
 }
 
 class MulFunction {
-  RqlQuery _rqlQuery;
+  final RqlQuery? _rqlQuery;
 
   MulFunction([this._rqlQuery]);
 
@@ -273,13 +273,13 @@ class MulFunction {
     } else if (number is Args) {
       return Mul([number]);
     } else {
-      throw RqlDriverError("Called mul with too few values");
+      throw RqlDriverError('Called mul with too few values');
     }
   }
 
   @override
   dynamic noSuchMethod(Invocation invocation) {
-    List positionalArguments = [];
+    var positionalArguments = [];
     if (_rqlQuery != null) {
       positionalArguments.add(_rqlQuery);
     }
@@ -289,7 +289,7 @@ class MulFunction {
 }
 
 class NeFunction {
-  RqlQuery _rqlQuery;
+  final RqlQuery? _rqlQuery;
 
   NeFunction([this._rqlQuery]);
 
@@ -299,13 +299,13 @@ class NeFunction {
     } else if (value is Args) {
       return Ne([value]);
     } else {
-      throw RqlDriverError("Called ne with too few values");
+      throw RqlDriverError('Called ne with too few values');
     }
   }
 
   @override
   dynamic noSuchMethod(Invocation invocation) {
-    List positionalArguments = [];
+    var positionalArguments = [];
     if (_rqlQuery != null) {
       positionalArguments.add(_rqlQuery);
     }
@@ -316,7 +316,7 @@ class NeFunction {
 
 /// Adds fields to an object
 class ObjectFunction {
-  Rethinkdb _rethinkdb;
+  final Rethinkdb _rethinkdb;
 
   ObjectFunction(this._rethinkdb);
 
@@ -332,7 +332,7 @@ class ObjectFunction {
 
 /// computes logical 'or' of two or more values
 class OrFunction {
-  RqlQuery _rqlQuery;
+  final RqlQuery? _rqlQuery;
 
   OrFunction([this._rqlQuery]);
 
@@ -340,13 +340,13 @@ class OrFunction {
     if (_rqlQuery != null) {
       return Or([_rqlQuery, number]);
     } else {
-      throw RqlDriverError("Called or with too few values");
+      throw RqlDriverError('Called or with too few values');
     }
   }
 
   @override
   dynamic noSuchMethod(Invocation invocation) {
-    List positionalArguments = [];
+    var positionalArguments = [];
     if (_rqlQuery != null) {
       positionalArguments.add(_rqlQuery);
     }
@@ -370,7 +370,7 @@ class PolygonFunction {
 /// Evaluate the expr in the context of one or more value bindings.
 /// The type of the result is the type of the value returned from expr.
 class RqlDoFunction {
-  Rethinkdb _rethinkdb;
+  final Rethinkdb _rethinkdb;
 
   RqlDoFunction(this._rethinkdb);
 
@@ -380,13 +380,13 @@ class RqlDoFunction {
 
   @override
   dynamic noSuchMethod(Invocation invocation) {
-    List args = List.from(invocation.positionalArguments);
+    var args = List.from(invocation.positionalArguments);
     return _rethinkdb.rqlDo(args.sublist(0, args.length - 1), args.last);
   }
 }
 
 class SubFunction {
-  RqlQuery _rqlQuery;
+  final RqlQuery? _rqlQuery;
 
   SubFunction([this._rqlQuery]);
 
@@ -396,13 +396,13 @@ class SubFunction {
     } else if (number is Args) {
       return Sub([number]);
     } else {
-      throw RqlDriverError("Called sub with too few values");
+      throw RqlDriverError('Called sub with too few values');
     }
   }
 
   @override
   dynamic noSuchMethod(Invocation invocation) {
-    List positionalArguments = [];
+    var positionalArguments = [];
     if (_rqlQuery != null) {
       positionalArguments.add(_rqlQuery);
     }
@@ -421,11 +421,11 @@ class Rethinkdb {
   /// password: password for the user (default "").
   Future<Connection> connect(
           {String db = 'test',
-          String host = "localhost",
+          String host = 'localhost',
           int port = 28015,
-          String user = "admin",
-          String password = "",
-          Map ssl}) =>
+          String user = 'admin',
+          String password = '',
+          Map? ssl}) =>
       Connection(db, host, port, user, password, ssl).reconnect();
 
   /// Reference a database.This command can be chained with other commands to do further processing on the data.
@@ -457,19 +457,19 @@ class Rethinkdb {
   }
 
   /// Select all documents in a table. This command can be chained with other commands to do further processing on the data.
-  Table table(String tableName, [Map options]) => Table(tableName, options);
+  Table table(String tableName, [Map? options]) => Table(tableName, options);
 
   /// Create a table. A RethinkDB table is a collection of JSON documents.
   /// If successful, the operation returns an object: {created: 1}. If a table with the same name already exists, the operation throws RqlRuntimeError.
   /// Note: that you can only use alphanumeric characters and underscores for the table name.
-  TableCreate tableCreate(String tableName, [Map options]) =>
+  TableCreate tableCreate(String tableName, [Map? options]) =>
       TableCreate(tableName, options);
 
   /// List all table names in a database. The result is a list of strings.
   TableList tableList() => TableList();
 
   /// Drop a table. The table and all its data will be deleted.
-  TableDrop tableDrop(String tableName, [Map options]) =>
+  TableDrop tableDrop(String tableName, [Map? options]) =>
       TableDrop(tableName, options);
 
   /// Specify ascending order on an attribute
@@ -480,7 +480,7 @@ class Rethinkdb {
 
   /// Create a time object for a specific time.
   Time time(int year, int month, int day,
-      {String timezone = 'Z', int hour, int minute, num second}) {
+      {String timezone = 'Z', int? hour, int? minute, num? second}) {
     if (second != null) {
       return Time(Args([year, month, day, hour, minute, second, timezone]));
     } else {
@@ -496,7 +496,7 @@ class Rethinkdb {
   /// We support all valid ISO 8601 formats except for week dates.
   /// If you pass an ISO 8601 date-time without a time zone, you must specify the time zone with the optarg default_timezone.
   ///
-  RqlISO8601 ISO8601(String stringTime, [defaultTimeZone = "Z"]) =>
+  RqlISO8601 ISO8601(String stringTime, [defaultTimeZone = 'Z']) =>
       RqlISO8601(stringTime, defaultTimeZone);
 
   /// Create a time object based on seconds since epoch.
@@ -519,19 +519,19 @@ class Rethinkdb {
   UserError error(String message) => UserError(message, {});
 
   /// Create a javascript expression.
-  JavaScript js(String js, [Map options]) => JavaScript(js, options);
+  JavaScript js(String js, [Map? options]) => JavaScript(js, options);
 
   /// Parse a JSON string on the server.
   Json json(String json) => Json(json, {});
 
   /// Count the total size of the group.
-  Map count = {"COUNT": true};
+  Map count = {'COUNT': true};
 
   /// Compute the sum of the given field in the group.
   Map sum(String attr) => {'SUM': attr};
 
   /// Compute the average value of the given attribute for the group.
-  Map avg(String attr) => {"AVG": attr};
+  Map avg(String attr) => {'AVG': attr};
 
   /// Returns the currently visited document.
   ImplicitVar row = ImplicitVar();
@@ -558,7 +558,7 @@ class Rethinkdb {
   }
 
   /// Returns logical inverse of the arguments given
-  Not not([value]) => Not(value == null ? true : value);
+  Not not([value]) => Not(value ?? true);
 
   /// Executes the mappingFunction for each item in a sequence or array
   /// and returns the transformed array. multiple sequences and arrays
@@ -581,12 +581,13 @@ class Rethinkdb {
   GeoJson geojson(Map geoJson) => GeoJson(geoJson);
 
   /// Construct a circular line or polygon.
-  Circle circle(point, num radius, [Map options]) =>
+  Circle circle(point, num radius, [Map? options]) =>
       Circle(point, radius, options);
 
   /// Compute the distance between a point and a geometry object
 
-  Distance distance(geo1, geo2, [Map options]) => Distance(geo1, geo2, options);
+  Distance distance(geo1, geo2, [Map? options]) =>
+      Distance(geo1, geo2, options);
 
   /// Construct a geometric line
   dynamic get line => LineFunction();
diff --git a/lib/src/ast.dart b/lib/src/ast.dart
index bb2c5a2..042158c 100644
--- a/lib/src/ast.dart
+++ b/lib/src/ast.dart
@@ -3,16 +3,16 @@ part of rethinkdb;
 const defaultNestingDepth = 20;
 
 List buildInvocationParams(List<dynamic> positionalArguments,
-    [List<String> optionsNames]) {
-  List argsList = [];
+    [List<String>? optionsNames]) {
+  var argsList = [];
   argsList.addAll(positionalArguments);
-  Map options = {};
+  Map? options = {};
   if (argsList.length > 1 && argsList.last is Map) {
     if (optionsNames == null) {
       options = argsList.removeLast();
     } else {
       Map lastArgument = argsList.last;
-      bool isOptions = true;
+      var isOptions = true;
       lastArgument.forEach((key, _) {
         if (!optionsNames.contains(key)) {
           isOptions = false;
@@ -23,8 +23,8 @@ List buildInvocationParams(List<dynamic> positionalArguments,
       }
     }
   }
-  List invocationParams = [argsList];
-  if (options.isNotEmpty) {
+  var invocationParams = [argsList];
+  if (options!.isNotEmpty) {
     invocationParams.add(options);
   }
   return invocationParams;
@@ -33,7 +33,7 @@ List buildInvocationParams(List<dynamic> positionalArguments,
 // TODO: handle index.
 // TODO: handle multi.
 class GroupFunction {
-  RqlQuery _rqlQuery;
+  final RqlQuery? _rqlQuery;
 
   GroupFunction([this._rqlQuery]);
 
@@ -47,9 +47,9 @@ class GroupFunction {
 
   @override
   dynamic noSuchMethod(Invocation invocation) {
-    List positionalArguments = [];
+    var positionalArguments = [];
     positionalArguments.addAll(invocation.positionalArguments);
-    List invocationParams =
+    var invocationParams =
         buildInvocationParams(positionalArguments, ['index', 'multi']);
     return Group(_rqlQuery, invocationParams[0],
         invocationParams.length == 2 ? invocationParams[1] : null);
@@ -57,7 +57,7 @@ class GroupFunction {
 }
 
 class HasFieldsFunction {
-  RqlQuery _rqlQuery;
+  final RqlQuery? _rqlQuery;
 
   HasFieldsFunction([this._rqlQuery]);
 
@@ -67,14 +67,14 @@ class HasFieldsFunction {
 
   @override
   dynamic noSuchMethod(Invocation invocation) {
-    List positionalArguments = [];
+    var positionalArguments = [];
     positionalArguments.addAll(invocation.positionalArguments);
     return HasFields(_rqlQuery, buildInvocationParams(positionalArguments));
   }
 }
 
 class MergeFunction {
-  RqlQuery _rqlQuery;
+  final RqlQuery? _rqlQuery;
 
   MergeFunction([this._rqlQuery]);
 
@@ -84,7 +84,7 @@ class MergeFunction {
 
   @override
   dynamic noSuchMethod(Invocation invocation) {
-    List positionalArguments = [];
+    var positionalArguments = [];
     positionalArguments.add(_rqlQuery);
     positionalArguments.addAll(invocation.positionalArguments);
     return Merge(positionalArguments);
@@ -92,26 +92,26 @@ class MergeFunction {
 }
 
 class PluckFunction {
-  RqlQuery _rqlQuery;
+  final RqlQuery? _rqlQuery;
 
   PluckFunction([this._rqlQuery]);
 
   Pluck call(args) {
-    return Pluck(_rqlQuery._listify(args, _rqlQuery));
+    return Pluck(_rqlQuery!._listify(args, _rqlQuery));
   }
 
   @override
   dynamic noSuchMethod(Invocation invocation) {
-    List positionalArguments = [];
+    var positionalArguments = [];
     positionalArguments.addAll(invocation.positionalArguments);
-    return Pluck(_rqlQuery._listify(
-        buildInvocationParams(positionalArguments), _rqlQuery));
+    return Pluck(_rqlQuery!
+        ._listify(buildInvocationParams(positionalArguments), _rqlQuery));
   }
 }
 
 // TODO: handle interleave.
 class UnionFunction {
-  RqlQuery _rqlQuery;
+  final RqlQuery? _rqlQuery;
 
   UnionFunction([this._rqlQuery]);
 
@@ -121,9 +121,9 @@ class UnionFunction {
 
   @override
   dynamic noSuchMethod(Invocation invocation) {
-    List positionalArguments = [];
+    var positionalArguments = [];
     positionalArguments.addAll(invocation.positionalArguments);
-    List invocationParams =
+    var invocationParams =
         buildInvocationParams(positionalArguments, ['interleave']);
     if (invocationParams.length == 2) {
       return Union(_rqlQuery, [invocationParams[0], invocationParams[1]]);
@@ -134,25 +134,25 @@ class UnionFunction {
 }
 
 class WithoutFunction {
-  RqlQuery _rqlQuery;
+  final RqlQuery? _rqlQuery;
 
   WithoutFunction([this._rqlQuery]);
 
   Without call(items) {
-    return Without(_rqlQuery._listify(items, _rqlQuery));
+    return Without(_rqlQuery!._listify(items, _rqlQuery));
   }
 
   @override
   dynamic noSuchMethod(Invocation invocation) {
-    List positionalArguments = [];
+    var positionalArguments = [];
     positionalArguments.addAll(invocation.positionalArguments);
-    return Without(_rqlQuery._listify(
-        buildInvocationParams(positionalArguments), _rqlQuery));
+    return Without(_rqlQuery!
+        ._listify(buildInvocationParams(positionalArguments), _rqlQuery));
   }
 }
 
 class WithFieldsFunction {
-  RqlQuery _rqlQuery;
+  final RqlQuery? _rqlQuery;
 
   WithFieldsFunction([this._rqlQuery]);
 
@@ -162,14 +162,14 @@ class WithFieldsFunction {
 
   @override
   dynamic noSuchMethod(Invocation invocation) {
-    List positionalArguments = [];
+    var positionalArguments = [];
     positionalArguments.addAll(invocation.positionalArguments);
     return WithFields(_rqlQuery, buildInvocationParams(positionalArguments));
   }
 }
 
 class RqlMapFunction {
-  RqlQuery _rqlQuery;
+  final RqlQuery _rqlQuery;
 
   RqlMapFunction(this._rqlQuery);
 
@@ -185,7 +185,7 @@ class RqlMapFunction {
 
   @override
   dynamic noSuchMethod(Invocation invocation) {
-    List mappingFunction = List.from(invocation.positionalArguments);
+    var mappingFunction = List.from(invocation.positionalArguments);
     mappingFunction.insert(0, _rqlQuery);
     var item = _rqlQuery._funcWrap(
         mappingFunction.removeLast(), mappingFunction.length);
@@ -194,12 +194,12 @@ class RqlMapFunction {
 }
 
 class RqlQuery {
-  p.Term_TermType tt;
+  p.Term_TermType? tt;
 
   List args = [];
   Map optargs = {};
 
-  RqlQuery([List args, Map optargs]) {
+  RqlQuery([List? args, Map? optargs]) {
     if (args != null) {
       args.forEach((e) {
         if (_checkIfOptions(e, tt)) {
@@ -211,8 +211,8 @@ class RqlQuery {
     }
 
     if (optargs != null) {
-      optargs.forEach((k, v) {
-        if ((k == "conflict") && (v is Function)) {
+      optargs!.forEach((k, v) {
+        if ((k == 'conflict') && (v is Function)) {
           this.optargs[k] = _expr(v, defaultNestingDepth, 3);
         } else {
           this.optargs[k] = _expr(v);
@@ -223,11 +223,11 @@ class RqlQuery {
 
   _expr(val, [nestingDepth = defaultNestingDepth, argsCount]) {
     if (nestingDepth <= 0) {
-      throw RqlDriverError("Nesting depth limit exceeded");
+      throw RqlDriverError('Nesting depth limit exceeded');
     }
 
     if (nestingDepth is int == false) {
-      throw RqlDriverError("Second argument to `r.expr` must be a number.");
+      throw RqlDriverError('Second argument to `r.expr` must be a number.');
     }
 
     if (val is RqlQuery) {
@@ -263,22 +263,22 @@ class RqlQuery {
   }
 
   String _formatTimeZoneOffset(DateTime val) {
-    String tz = val.timeZoneOffset.inHours.toString();
+    var tz = val.timeZoneOffset.inHours.toString();
 
     if (!val.timeZoneOffset.inHours.isNegative) {
-      tz = "+$tz";
+      tz = '+$tz';
     }
 
     if (tz.length == 2) {
-      tz = tz.replaceRange(0, 1, tz[0] + "0");
+      tz = tz.replaceRange(0, 1, tz[0] + '0');
     }
 
     return tz;
   }
 
-  Future run(Connection c, [globalOptargs]) {
+  Future run(Connection? c, [globalOptargs]) {
     if (c == null) {
-      throw RqlDriverError("RqlQuery.run must be given a connection to run.");
+      throw RqlDriverError('RqlQuery.run must be given a connection to run.');
     }
 
     return c._start(this, globalOptargs);
@@ -288,23 +288,23 @@ class RqlQuery {
   //one or two, we can't know if the final argument in a query
   //is actually an option or just another arg.  _check_if_options
   //checks if all of the keys in the object are in options
-  _checkIfOptions(obj, p.Term_TermType tt) {
+  _checkIfOptions(obj, p.Term_TermType? tt) {
     if (obj is Map == false) {
       return false;
     } else {
-      List options = _RqlAllOptions(tt).options;
+      var options = _RqlAllOptions(tt).options;
 
       return obj.keys.every(options.contains);
     }
   }
 
   build() {
-    List res = [];
-    if (this.tt != null) {
-      res.add(this.tt.value);
+    var res = [];
+    if (tt != null) {
+      res.add(tt!.value);
     }
 
-    List argList = [];
+    var argList = [];
     args.forEach((arg) {
       if (arg != null) {
         argList.add(arg.build());
@@ -365,7 +365,7 @@ class RqlQuery {
       return true;
     }
 
-    var optArgKeys = query.optargs.values;
+    dynamic optArgKeys = query.optargs.values;
 
     if (optArgKeys.any(_ivarScan)) {
       return true;
@@ -383,19 +383,19 @@ class RqlQuery {
   }
 
   _reqlTypeTimeToDatetime(Map obj) {
-    if (obj["epoch_time"] == null) {
+    if (obj['epoch_time'] == null) {
       throw RqlDriverError(
           'pseudo-type TIME object $obj does not have expected field "epoch_time".');
     } else {
-      String s = obj["epoch_time"].toString();
-      if (s.contains(".")) {
+      var s = obj['epoch_time'].toString();
+      if (s.contains('.')) {
         List l = s.split('.');
         while (l[1].length < 3) {
-          l[1] = l[1] + "0";
+          l[1] = l[1] + '0';
         }
-        s = l.join("");
+        s = l.join('');
       } else {
-        s += "000";
+        s += '000';
       }
       return DateTime.fromMillisecondsSinceEpoch(int.parse(s));
     }
@@ -414,19 +414,19 @@ class RqlQuery {
     return retObj;
   }
 
-  _convertPseudotype(Map obj, Map formatOpts) {
-    String reqlType = obj['\$reql_type\$'];
+  _convertPseudotype(Map obj, Map? formatOpts) {
+    String? reqlType = obj['\$reql_type\$'];
     if (reqlType != null) {
       if (reqlType == 'TIME') {
         if (formatOpts == null || formatOpts.isEmpty) {
-          formatOpts = {"time_format": "native"};
+          formatOpts = {'time_format': 'native'};
         }
-        String timeFormat = formatOpts['time_format'];
+        String? timeFormat = formatOpts['time_format'];
         if (timeFormat != null || timeFormat == 'native') {
           // Convert to native dart DateTime
           return _reqlTypeTimeToDatetime(obj);
         } else if (timeFormat != 'raw') {
-          throw RqlDriverError("Unknown time_format run option $timeFormat.");
+          throw RqlDriverError('Unknown time_format run option $timeFormat.');
         }
       } else if (reqlType == 'GROUPED_DATA') {
         if (formatOpts == null ||
@@ -437,8 +437,8 @@ class RqlQuery {
           throw RqlDriverError(
               "Unknown group_format run option ${formatOpts['group_format']}.");
         }
-      } else if (reqlType == "BINARY") {
-        if (formatOpts == null || formatOpts["binary_format"] == "native") {
+      } else if (reqlType == 'BINARY') {
+        if (formatOpts == null || formatOpts['binary_format'] == 'native') {
           /// the official drivers decode the BASE64 string to binary data
           /// this driver currently has a bug with its [_reqlTypeBinaryToBytes]
           /// for some reason, when trying to convert the index function for
@@ -455,11 +455,11 @@ class RqlQuery {
           throw RqlDriverError(
               "Unknown binary_format run option: ${formatOpts["binary_format"]}");
         }
-      } else if (reqlType == "GEOMETRY") {
+      } else if (reqlType == 'GEOMETRY') {
         obj.remove('\$reql_type\$');
         return obj;
       } else {
-        throw RqlDriverError("Unknown pseudo-type $reqlType");
+        throw RqlDriverError('Unknown pseudo-type $reqlType');
       }
     }
 
@@ -512,7 +512,7 @@ class RqlQuery {
 
   Values values() => Values(this);
 
-  Changes changes([Map opts]) => Changes(this, opts);
+  Changes changes([Map? opts]) => Changes(this, opts);
 
   // Polymorphic object/sequence operations
   dynamic get pluck => PluckFunction(this);
@@ -569,7 +569,7 @@ class RqlQuery {
 
   Match match(String regex) => Match(this, regex);
 
-  Split split([seperator = " ", maxSplits]) =>
+  Split split([seperator = ' ', maxSplits]) =>
       Split(this, seperator, maxSplits);
 
   Upcase upcase() => Upcase(this);
@@ -578,7 +578,7 @@ class RqlQuery {
 
   IsEmpty isEmpty() => IsEmpty(this);
 
-  Slice slice(int start, [end, Map options]) =>
+  Slice slice(int start, [end, Map? options]) =>
       Slice(this, start, end, options);
 
   Fold fold(base, function, [options]) => Fold(this, base, function, options);
@@ -608,7 +608,7 @@ class RqlQuery {
   Get get(id) => Get(this, id);
 
   OrderBy orderBy(attrs, [index]) {
-    if (attrs is Map && attrs.containsKey("index")) {
+    if (attrs is Map && attrs.containsKey('index')) {
       index = attrs;
       attrs = [];
 
@@ -632,7 +632,7 @@ class RqlQuery {
         }
       });
     } else {
-      List tmp = [];
+      var tmp = [];
       tmp.add(attrs);
       if (index is Map == false && index != null) {
         tmp.add(index);
@@ -644,19 +644,19 @@ class RqlQuery {
     return OrderBy(_listify(attrs, this), index);
   }
 
-  operator +(other) => this.add(other);
-  operator -(other) => this.sub(other);
-  operator *(other) => this.mul(other);
-  operator /(other) => this.div(other);
+  operator +(other) => add(other);
+  operator -(other) => sub(other);
+  operator *(other) => mul(other);
+  operator /(other) => div(other);
   // TODO see if we can still do this. != isn't assignable so maybe
   // it makes more sense not to do == anyway.
   //operator ==(other) => this.eq(other);
-  operator <=(other) => this.le(other);
-  operator >=(other) => this.ge(other);
-  operator <(other) => this.lt(other);
-  operator >(other) => this.gt(other);
-  operator %(other) => this.mod(other);
-  operator [](attr) => this.pluck(attr);
+  operator <=(other) => le(other);
+  operator >=(other) => ge(other);
+  operator <(other) => lt(other);
+  operator >(other) => gt(other);
+  operator %(other) => mod(other);
+  operator [](attr) => pluck(attr);
 
   Between between(lowerKey, [upperKey, options]) =>
       Between(this, lowerKey, upperKey, options);
@@ -741,7 +741,7 @@ class RqlQuery {
   GetIntersecting getIntersecting(geo, Map options) =>
       GetIntersecting(this, geo, options);
 
-  GetNearest getNearest(point, [Map options]) =>
+  GetNearest getNearest(point, [Map? options]) =>
       GetNearest(this, point, options);
 
   Includes includes(geo) => Includes(this, geo);
@@ -758,7 +758,7 @@ class RqlQuery {
 
   Status status() => Status(this);
 
-  Wait wait([Map options]) => Wait(this, options);
+  Wait wait([Map? options]) => Wait(this, options);
 
   call(attr) {
     return GetField(this, attr);
@@ -767,54 +767,60 @@ class RqlQuery {
 
 //TODO write pretty compose functions
 class RqlBoolOperQuery extends RqlQuery {
-  RqlBoolOperQuery([List args, Map optargs]) : super(args, optargs);
+  RqlBoolOperQuery([List? args, Map? optargs]) : super(args, optargs);
 }
 
 class RqlBiOperQuery extends RqlQuery {
-  RqlBiOperQuery([List args, Map optargs]) : super(args, optargs);
+  RqlBiOperQuery([List? args, Map? optargs]) : super(args, optargs);
 }
 
 class RqlBiCompareOperQuery extends RqlBiOperQuery {
-  RqlBiCompareOperQuery([List args, Map optargs]) : super(args, optargs);
+  RqlBiCompareOperQuery([List? args, Map? optargs]) : super(args, optargs);
 }
 
 class RqlTopLevelQuery extends RqlQuery {
-  RqlTopLevelQuery([List args, Map optargs]) : super(args, optargs);
+  RqlTopLevelQuery([List? args, Map? optargs]) : super(args, optargs);
 }
 
 class RqlMethodQuery extends RqlQuery {
-  RqlMethodQuery([List args, Map optargs]) : super(args, optargs);
+  RqlMethodQuery([List? args, Map? optargs]) : super(args, optargs);
 }
 
 class RqlBracketQuery extends RqlMethodQuery {
-  RqlBracketQuery([List args, Map optargs]) : super(args, optargs);
+  RqlBracketQuery([List? args, Map? optargs]) : super(args, optargs);
 }
 
 class Datum extends RqlQuery {
+  @override
   List args = [];
+  @override
   Map optargs = {};
   var data;
 
   Datum(val) : super(null, null) {
-    this.data = val;
+    data = val;
   }
 
+  @override
   build() {
-    return this.data;
+    return data;
   }
 }
 
 class MakeArray extends RqlQuery {
-  p.Term_TermType tt = p.Term_TermType.MAKE_ARRAY;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.MAKE_ARRAY;
 
   MakeArray(args) : super(args);
 }
 
 class MakeObj extends RqlQuery {
-  p.Term_TermType tt = p.Term_TermType.MAKE_OBJ;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.MAKE_OBJ;
 
   MakeObj(objDict) : super(null, objDict);
 
+  @override
   build() {
     var res = {};
     optargs.forEach((k, v) {
@@ -825,315 +831,363 @@ class MakeObj extends RqlQuery {
 }
 
 class Var extends RqlQuery {
-  p.Term_TermType tt = p.Term_TermType.VAR;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.VAR;
 
   Var(args) : super([args]);
 
+  @override
   call(arg) => GetField(this, arg);
 }
 
 class JavaScript extends RqlTopLevelQuery {
-  p.Term_TermType tt = p.Term_TermType.JAVASCRIPT;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.JAVASCRIPT;
 
   JavaScript(args, [optargs]) : super([args], optargs);
 }
 
 class Http extends RqlTopLevelQuery {
-  p.Term_TermType tt = p.Term_TermType.HTTP;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.HTTP;
 
   Http(args, [optargs]) : super([args], optargs);
 }
 
 class UserError extends RqlTopLevelQuery {
-  p.Term_TermType tt = p.Term_TermType.ERROR;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.ERROR;
 
   UserError(args, [optargs]) : super([args], optargs);
 }
 
 class Random extends RqlTopLevelQuery {
-  p.Term_TermType tt = p.Term_TermType.RANDOM;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.RANDOM;
 
-  Random(optargs) : super(null, optargs == null ? {} : optargs);
+  Random(optargs) : super(null, optargs ?? {});
 
-  Random.leftBound(left, optargs)
-      : super([left], optargs == null ? {} : optargs);
+  Random.leftBound(left, optargs) : super([left], optargs ?? {});
 
-  Random.rightBound(left, right, optargs)
-      : super([left, right], optargs == null ? {} : optargs);
+  Random.rightBound(left, right, optargs) : super([left, right], optargs ?? {});
 }
 
 class Changes extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.CHANGES;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.CHANGES;
 
   Changes([arg, opts]) : super([arg], opts);
 }
 
 class Fold extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.FOLD;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.FOLD;
 
   Fold(seq, base, func, [opts]) : super([seq, base, func], opts);
 }
 
 class Grant extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.GRANT;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.GRANT;
 
   Grant([scope, user, options]) : super([scope, user], options);
 }
 
 class Default extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.DEFAULT;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.DEFAULT;
 
   Default(obj, value) : super([obj, value]);
 }
 
 class ImplicitVar extends RqlQuery {
-  p.Term_TermType tt = p.Term_TermType.IMPLICIT_VAR;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.IMPLICIT_VAR;
 
   ImplicitVar() : super();
 
+  @override
   call(arg) => GetField(this, arg);
 }
 
 class Eq extends RqlBiCompareOperQuery {
-  p.Term_TermType tt = p.Term_TermType.EQ;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.EQ;
 
   Eq(numbers) : super(numbers);
 }
 
 class Ne extends RqlBiCompareOperQuery {
-  p.Term_TermType tt = p.Term_TermType.NE;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.NE;
 
   Ne(numbers) : super(numbers);
 }
 
 class Lt extends RqlBiCompareOperQuery {
-  p.Term_TermType tt = p.Term_TermType.LT;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.LT;
 
   Lt(numbers) : super(numbers);
 }
 
 class Le extends RqlBiCompareOperQuery {
-  p.Term_TermType tt = p.Term_TermType.LE;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.LE;
 
   Le(numbers) : super(numbers);
 }
 
 class Gt extends RqlBiCompareOperQuery {
-  p.Term_TermType tt = p.Term_TermType.GT;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.GT;
 
   Gt(numbers) : super(numbers);
 }
 
 class Ge extends RqlBiCompareOperQuery {
-  p.Term_TermType tt = p.Term_TermType.GE;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.GE;
 
   Ge(numbers) : super(numbers);
 }
 
 class Not extends RqlQuery {
-  p.Term_TermType tt = p.Term_TermType.NOT;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.NOT;
 
   Not([args]) : super([args]);
 }
 
 class Add extends RqlBiOperQuery {
-  p.Term_TermType tt = p.Term_TermType.ADD;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.ADD;
 
   Add(objects) : super(objects);
 }
 
 class Sub extends RqlBiOperQuery {
-  p.Term_TermType tt = p.Term_TermType.SUB;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.SUB;
 
   Sub(numbers) : super(numbers);
 }
 
 class Mul extends RqlBiOperQuery {
-  p.Term_TermType tt = p.Term_TermType.MUL;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.MUL;
 
   Mul(numbers) : super(numbers);
 }
 
 class Div extends RqlBiOperQuery {
-  p.Term_TermType tt = p.Term_TermType.DIV;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.DIV;
 
   Div(numbers) : super(numbers);
 }
 
 class Mod extends RqlBiOperQuery {
-  p.Term_TermType tt = p.Term_TermType.MOD;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.MOD;
 
   Mod(modable, obj) : super([modable, obj]);
 }
 
 class Append extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.APPEND;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.APPEND;
 
   Append(ar, val) : super([ar, val]);
 }
 
 class Floor extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.FLOOR;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.FLOOR;
 
   Floor(ar) : super([ar]);
 }
 
 class Ceil extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.CEIL;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.CEIL;
 
   Ceil(ar) : super([ar]);
 }
 
 class Round extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.ROUND;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.ROUND;
 
   Round(ar) : super([ar]);
 }
 
 class Prepend extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.PREPEND;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.PREPEND;
 
   Prepend(ar, val) : super([ar, val]);
 }
 
 class Difference extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.DIFFERENCE;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.DIFFERENCE;
 
   Difference(diffable, ar) : super([diffable, ar]);
 }
 
 class SetInsert extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.SET_INSERT;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.SET_INSERT;
 
   SetInsert(ar, val) : super([ar, val]);
 }
 
 class SetUnion extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.SET_UNION;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.SET_UNION;
 
   SetUnion(un, val) : super([un, val]);
 }
 
 class SetIntersection extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.SET_INTERSECTION;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.SET_INTERSECTION;
 
   SetIntersection(inter, ar) : super([inter, ar]);
 }
 
 class SetDifference extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.SET_DIFFERENCE;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.SET_DIFFERENCE;
 
   SetDifference(diff, ar) : super([diff, ar]);
 }
 
 class Slice extends RqlBracketQuery {
-  p.Term_TermType tt = p.Term_TermType.SLICE;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.SLICE;
 
-  Slice(selection, int start, [end, Map options])
+  Slice(selection, int start, [end, Map? options])
       : super([selection, start, end], options);
 }
 
 class Skip extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.SKIP;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.SKIP;
 
   Skip(selection, int number) : super([selection, number]);
 }
 
 class Limit extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.LIMIT;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.LIMIT;
 
   Limit(selection, int number) : super([selection, number]);
 }
 
 class GetField extends RqlBracketQuery {
-  p.Term_TermType tt = p.Term_TermType.BRACKET;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.BRACKET;
 
   GetField(obj, field) : super([obj, field]);
 }
 
 class Contains extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.CONTAINS;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.CONTAINS;
 
   Contains(tbl, items) : super([tbl, items]);
 }
 
 class HasFields extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.HAS_FIELDS;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.HAS_FIELDS;
 
   HasFields(obj, items) : super([obj, items]);
 }
 
 class WithFields extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.WITH_FIELDS;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.WITH_FIELDS;
 
   WithFields(obj, fields) : super([obj, fields]);
 }
 
 class Keys extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.KEYS;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.KEYS;
 
   Keys(obj) : super([obj]);
 }
 
 class Values extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.VALUES;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.VALUES;
 
   Values(obj) : super([obj]);
 }
 
 class RqlObject extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.OBJECT;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.OBJECT;
 
   RqlObject(args) : super(args);
 }
 
 class Pluck extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.PLUCK;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.PLUCK;
 
   Pluck(items) : super(items);
 }
 
 class Without extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.WITHOUT;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.WITHOUT;
 
   Without(items) : super(items);
 }
 
 class Merge extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.MERGE;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.MERGE;
 
   Merge(objects) : super(objects);
 }
 
 class Between extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.BETWEEN;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.BETWEEN;
 
   Between(tbl, lower, upper, [options]) : super([tbl, lower, upper], options);
 }
 
 class DB extends RqlTopLevelQuery {
-  p.Term_TermType tt = p.Term_TermType.DB;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.DB;
 
-  DB(String dbName) : super([dbName]);
+  DB(String? dbName) : super([dbName]);
 
   TableList tableList() => TableList(this);
 
-  TableCreate tableCreate(String tableName, [Map options]) =>
+  TableCreate tableCreate(String tableName, [Map? options]) =>
       TableCreate.fromDB(this, tableName, options);
 
   TableDrop tableDrop(String tableName) => TableDrop.fromDB(this, tableName);
 
-  Table table(String tableName, [Map options]) =>
+  Table table(String tableName, [Map? options]) =>
       Table.fromDB(this, tableName, options);
 
-  Grant grant(String user, [Map options]) => Grant(this, user, options);
+  Grant grant(String user, [Map? options]) => Grant(this, user, options);
 }
 
 class FunCall extends RqlQuery {
-  p.Term_TermType tt = p.Term_TermType.FUNCALL;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.FUNCALL;
 
   FunCall(argslist, expression) : super() {
-    List temp = [];
+    var temp = [];
     temp.add(expression);
     int argsCount;
     if (argslist is List) {
@@ -1144,17 +1198,18 @@ class FunCall extends RqlQuery {
       temp.add(argslist);
     }
 
-    this.args.addAll(temp.map((arg) {
+    args.addAll(temp.map((arg) {
       return _expr(arg, defaultNestingDepth, argsCount);
     }));
   }
 }
 
 class GetAllFunction extends RqlQuery {
-  Table _table;
+  final Table _table;
 
   GetAllFunction(this._table);
 
+  @override
   GetAll call(args, [options]) {
     if (options != null && options is Map == false) {
       args = _listify(args, _table);
@@ -1166,17 +1221,18 @@ class GetAllFunction extends RqlQuery {
 
   @override
   dynamic noSuchMethod(Invocation invocation) {
-    List argsList = [];
+    var argsList = [];
     argsList.addAll(invocation.positionalArguments);
     return Function.apply(call, [argsList]);
   }
 }
 
 class IndexStatusFunction extends RqlQuery {
-  Table _table;
+  final Table _table;
 
   IndexStatusFunction(this._table);
 
+  @override
   IndexStatus call([indexes]) {
     if (indexes == null) {
       return IndexStatus.all(_table);
@@ -1186,17 +1242,18 @@ class IndexStatusFunction extends RqlQuery {
 
   @override
   dynamic noSuchMethod(Invocation invocation) {
-    List argsList = [];
+    var argsList = [];
     argsList.addAll(invocation.positionalArguments);
     return Function.apply(call, [argsList]);
   }
 }
 
 class IndexWaitFunction extends RqlQuery {
-  Table _table;
+  final Table _table;
 
   IndexWaitFunction(this._table);
 
+  @override
   IndexWait call([indexes]) {
     if (indexes == null) {
       return IndexWait.all(_table);
@@ -1206,18 +1263,19 @@ class IndexWaitFunction extends RqlQuery {
 
   @override
   dynamic noSuchMethod(Invocation invocation) {
-    List argsList = [];
+    var argsList = [];
     argsList.addAll(invocation.positionalArguments);
     return Function.apply(call, [argsList]);
   }
 }
 
 class Table extends RqlQuery {
-  p.Term_TermType tt = p.Term_TermType.TABLE;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.TABLE;
 
-  Table(String tableName, [Map options]) : super([tableName], options);
+  Table(String tableName, [Map? options]) : super([tableName], options);
 
-  Table.fromDB(DB db, String tableName, [Map options])
+  Table.fromDB(DB db, String tableName, [Map? options])
       : super([db, tableName], options);
 
   Insert insert(records, [options]) => Insert(this, records, options);
@@ -1226,7 +1284,7 @@ class Table extends RqlQuery {
 
   IndexList indexList() => IndexList(this);
 
-  IndexCreate indexCreate(indexName, [indexFunction, Map options]) {
+  IndexCreate indexCreate(indexName, [indexFunction, Map? options]) {
     if (indexFunction == null && options == null) {
       return IndexCreate(this, indexName);
     } else if (indexFunction != null && indexFunction is Map) {
@@ -1238,260 +1296,301 @@ class Table extends RqlQuery {
 
   IndexDrop indexDrop(indexName) => IndexDrop(this, indexName);
 
-  IndexRename indexRename(oldName, newName, [Map options]) =>
+  IndexRename indexRename(oldName, newName, [Map? options]) =>
       IndexRename(this, oldName, newName, options);
 
   dynamic get indexStatus => IndexStatusFunction(this);
 
   dynamic get indexWait => IndexWaitFunction(this);
 
+  @override
   Update update(args, [options]) => Update(this, _funcWrap(args, 1), options);
 
   Sync sync() => Sync(this);
 
   dynamic get getAll => GetAllFunction(this);
 
+  @override
   InnerJoin innerJoin(otherSeq, [predicate]) =>
       InnerJoin(this, otherSeq, predicate);
 }
 
 class Get extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.GET;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.GET;
 
   Get(table, key) : super([table, key]);
 
+  @override
   call(attr) {
     return GetField(this, attr);
   }
 }
 
 class GetAll extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.GET_ALL;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.GET_ALL;
 
   GetAll(keys, [options]) : super(keys, options);
 
+  @override
   call(attr) {
     return GetField(this, attr);
   }
 }
 
 class Reduce extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.REDUCE;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.REDUCE;
 
   Reduce(seq, reductionFunction, [base])
       : super([seq, reductionFunction], base);
 }
 
 class Sum extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.SUM;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.SUM;
 
   Sum(obj, args) : super([obj, args]);
 }
 
 class Avg extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.AVG;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.AVG;
 
   Avg(obj, args) : super([obj, args]);
 }
 
 class Min extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.MIN;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.MIN;
 
   Min(obj, args) : super([obj, args]);
 }
 
 class Max extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.MAX;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.MAX;
 
   Max(obj, args) : super([obj, args]);
 }
 
 class RqlMap extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.MAP;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.MAP;
 
   RqlMap(argslist, expression) : super() {
-    int argsCount = argslist.length;
-    List temp = [];
+    int? argsCount = argslist.length;
+    var temp = [];
     temp.addAll(argslist);
     temp.add(_funcWrap(expression, argsCount));
-    this.args.addAll(temp.map((arg) {
+    args.addAll(temp.map((arg) {
       return _expr(arg, defaultNestingDepth, argsCount);
     }));
   }
 }
 
 class Filter extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.FILTER;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.FILTER;
 
-  Filter(selection, predicate, [Map options])
+  Filter(selection, predicate, [Map? options])
       : super([selection, predicate], options);
 }
 
 class ConcatMap extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.CONCAT_MAP;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.CONCAT_MAP;
 
   ConcatMap(seq, mappingFunction) : super([seq, mappingFunction]);
 }
 
 class OrderBy extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.ORDER_BY;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.ORDER_BY;
 
-  OrderBy(args, [Map options]) : super(args, options);
+  OrderBy(args, [Map? options]) : super(args, options);
 }
 
 class Distinct extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.DISTINCT;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.DISTINCT;
 
   Distinct(sequence) : super([sequence]);
 }
 
 class Count extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.COUNT;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.COUNT;
 
   Count([seq, filter]) : super([seq, filter]);
 }
 
 class Union extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.UNION;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.UNION;
 
   Union(first, second) : super([first, second]);
 }
 
 class Nth extends RqlBracketQuery {
-  p.Term_TermType tt = p.Term_TermType.NTH;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.NTH;
 
   Nth(selection, int index) : super([selection, index]);
 }
 
 class Match extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.MATCH;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.MATCH;
 
   Match(obj, regex) : super([obj, regex]);
 }
 
 class Split extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.SPLIT;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.SPLIT;
 
   Split(tbl, [obj, maxSplits]) : super([tbl, obj, maxSplits]);
 }
 
 class Upcase extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.UPCASE;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.UPCASE;
 
   Upcase(obj) : super([obj]);
 }
 
 class Downcase extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.DOWNCASE;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.DOWNCASE;
 
   Downcase(obj) : super([obj]);
 }
 
 class OffsetsOf extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.OFFSETS_OF;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.OFFSETS_OF;
 
   OffsetsOf(seq, index) : super([seq, index]);
 }
 
 class IsEmpty extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.IS_EMPTY;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.IS_EMPTY;
 
   IsEmpty(selection) : super([selection]);
 }
 
 class Group extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.GROUP;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.GROUP;
 
-  Group(obj, groups, [options]) : super([obj]..addAll(groups), options);
+  Group(obj, groups, [options]) : super([obj, ...groups], options);
 }
 
 class InnerJoin extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.INNER_JOIN;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.INNER_JOIN;
 
   InnerJoin(first, second, predicate) : super([first, second, predicate]);
 }
 
 class OuterJoin extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.OUTER_JOIN;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.OUTER_JOIN;
 
   OuterJoin(first, second, predicate) : super([first, second, predicate]);
 }
 
 class EqJoin extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.EQ_JOIN;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.EQ_JOIN;
 
-  EqJoin(first, second, predicate, [Map options])
+  EqJoin(first, second, predicate, [Map? options])
       : super([first, second, predicate], options);
 }
 
 class Zip extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.ZIP;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.ZIP;
 
   Zip(seq) : super([seq]);
 }
 
 class CoerceTo extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.COERCE_TO;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.COERCE_TO;
 
   CoerceTo(obj, String type) : super([obj, type]);
 }
 
 class Ungroup extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.UNGROUP;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.UNGROUP;
 
   Ungroup(obj) : super([obj]);
 }
 
 class TypeOf extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.TYPE_OF;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.TYPE_OF;
 
   TypeOf(obj) : super([obj]);
 }
 
 class Update extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.UPDATE;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.UPDATE;
 
-  Update(tbl, expression, [Map options]) : super([tbl, expression], options);
+  Update(tbl, expression, [Map? options]) : super([tbl, expression], options);
 }
 
 class Delete extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.DELETE;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.DELETE;
 
-  Delete(selection, [Map options]) : super([selection], options);
+  Delete(selection, [Map? options]) : super([selection], options);
 }
 
 class Replace extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.REPLACE;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.REPLACE;
 
   Replace(table, expression, [options]) : super([table, expression], options);
 }
 
 class Insert extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.INSERT;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.INSERT;
 
-  Insert(table, records, [Map options]) : super([table, records], options);
+  Insert(table, records, [Map? options]) : super([table, records], options);
 }
 
 class DbCreate extends RqlTopLevelQuery {
-  p.Term_TermType tt = p.Term_TermType.DB_CREATE;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.DB_CREATE;
 
-  DbCreate(String dbName, [Map options]) : super([dbName], options);
+  DbCreate(String dbName, [Map? options]) : super([dbName], options);
 }
 
 class DbDrop extends RqlTopLevelQuery {
-  p.Term_TermType tt = p.Term_TermType.DB_DROP;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.DB_DROP;
 
-  DbDrop(String dbName, [Map options]) : super([dbName], options);
+  DbDrop(String dbName, [Map? options]) : super([dbName], options);
 }
 
 class DbList extends RqlTopLevelQuery {
-  p.Term_TermType tt = p.Term_TermType.DB_LIST;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.DB_LIST;
 
   DbList() : super();
 }
 
 class Range extends RqlTopLevelQuery {
-  p.Term_TermType tt = p.Term_TermType.RANGE;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.RANGE;
 
   Range(end) : super([end]);
 
@@ -1501,57 +1600,65 @@ class Range extends RqlTopLevelQuery {
 }
 
 class TableCreate extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.TABLE_CREATE;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.TABLE_CREATE;
 
-  TableCreate(table, [Map options]) : super([table], options);
+  TableCreate(table, [Map? options]) : super([table], options);
 
-  TableCreate.fromDB(db, table, [Map options]) : super([db, table], options);
+  TableCreate.fromDB(db, table, [Map? options]) : super([db, table], options);
 }
 
 class TableDrop extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.TABLE_DROP;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.TABLE_DROP;
 
-  TableDrop(tbl, [Map options]) : super([tbl], options);
+  TableDrop(tbl, [Map? options]) : super([tbl], options);
 
-  TableDrop.fromDB(db, tbl, [Map options]) : super([db, tbl], options);
+  TableDrop.fromDB(db, tbl, [Map? options]) : super([db, tbl], options);
 }
 
 class TableList extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.TABLE_LIST;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.TABLE_LIST;
 
   TableList([db]) : super(db == null ? [] : [db]);
 }
 
 class IndexCreate extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.INDEX_CREATE;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.INDEX_CREATE;
 
-  IndexCreate(tbl, index, [Map options]) : super([tbl, index], options);
+  IndexCreate(tbl, index, [Map? options]) : super([tbl, index], options);
 
-  IndexCreate.withIndexFunction(tbl, index, [indexFunction, Map options])
+  IndexCreate.withIndexFunction(tbl, index, [indexFunction, Map? options])
       : super([tbl, index, indexFunction], options);
 }
 
 class IndexDrop extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.INDEX_DROP;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.INDEX_DROP;
 
   IndexDrop(table, index) : super([table, index]);
 }
 
 class IndexRename extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.INDEX_RENAME;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.INDEX_RENAME;
 
   IndexRename(table, oldName, newName, options)
       : super([table, oldName, newName], options);
 }
 
 class IndexList extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.INDEX_LIST;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.INDEX_LIST;
 
   IndexList(table) : super([table]);
 }
 
 class IndexStatus extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.INDEX_STATUS;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.INDEX_STATUS;
 
   IndexStatus(tbl, indexList)
       : super([tbl, indexList is List ? Args(indexList) : indexList]);
@@ -1559,7 +1666,8 @@ class IndexStatus extends RqlMethodQuery {
 }
 
 class IndexWait extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.INDEX_WAIT;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.INDEX_WAIT;
 
   IndexWait(tbl, indexList)
       : super([tbl, indexList is List ? Args(indexList) : indexList]);
@@ -1567,13 +1675,15 @@ class IndexWait extends RqlMethodQuery {
 }
 
 class Sync extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.SYNC;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.SYNC;
 
   Sync(table) : super([table]);
 }
 
 class Branch extends RqlTopLevelQuery {
-  p.Term_TermType tt = p.Term_TermType.BRANCH;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.BRANCH;
 
   Branch(predicate, trueBranch, falseBranch)
       : super([predicate, trueBranch, falseBranch]);
@@ -1581,161 +1691,188 @@ class Branch extends RqlTopLevelQuery {
 }
 
 class Or extends RqlBoolOperQuery {
-  p.Term_TermType tt = p.Term_TermType.OR;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.OR;
 
   Or(orables) : super(orables);
 }
 
 class And extends RqlBoolOperQuery {
-  p.Term_TermType tt = p.Term_TermType.AND;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.AND;
 
   And(andables) : super(andables);
 }
 
 class ForEach extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.FOR_EACH;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.FOR_EACH;
 
   ForEach(obj, writeQuery) : super([obj, writeQuery]);
 }
 
 class Info extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.INFO;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.INFO;
 
   Info(knowable) : super([knowable]);
 }
 
 class InsertAt extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.INSERT_AT;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.INSERT_AT;
 
   InsertAt(ar, index, value) : super([ar, index, value]);
 }
 
 class SpliceAt extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.SPLICE_AT;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.SPLICE_AT;
 
   SpliceAt(ar, index, value) : super([ar, index, value]);
 }
 
 class DeleteAt extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.DELETE_AT;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.DELETE_AT;
 
   DeleteAt(ar, index, value) : super([ar, index, value]);
 }
 
 class ChangeAt extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.CHANGE_AT;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.CHANGE_AT;
 
   ChangeAt(ar, index, value) : super([ar, index, value]);
 }
 
 class Sample extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.SAMPLE;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.SAMPLE;
 
   Sample(selection, int i) : super([selection, i]);
 }
 
 class Uuid extends RqlQuery {
-  p.Term_TermType tt = p.Term_TermType.UUID;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.UUID;
   Uuid(str) : super(str == null ? [] : [str]);
 }
 
 class Json extends RqlTopLevelQuery {
-  p.Term_TermType tt = p.Term_TermType.JSON;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.JSON;
 
-  Json(String jsonString, [Map options]) : super([jsonString], options);
+  Json(String jsonString, [Map? options]) : super([jsonString], options);
 }
 
 class Args extends RqlTopLevelQuery {
-  p.Term_TermType tt = p.Term_TermType.ARGS;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.ARGS;
 
   Args(List array) : super([array]);
 }
 
 class ToISO8601 extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.TO_ISO8601;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.TO_ISO8601;
 
   ToISO8601(obj) : super([obj]);
 }
 
 class During extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.DURING;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.DURING;
 
-  During(obj, start, end, [Map options]) : super([obj, start, end], options);
+  During(obj, start, end, [Map? options]) : super([obj, start, end], options);
 }
 
 class Date extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.DATE;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.DATE;
 
   Date(obj) : super([obj]);
 }
 
 class TimeOfDay extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.TIME_OF_DAY;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.TIME_OF_DAY;
 
   TimeOfDay(obj) : super([obj]);
 }
 
 class Timezone extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.TIMEZONE;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.TIMEZONE;
 
   Timezone(zone) : super([zone]);
 }
 
 class Year extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.YEAR;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.YEAR;
 
   Year(year) : super([year]);
 }
 
 class Month extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.MONTH;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.MONTH;
 
   Month(month) : super([month]);
 }
 
 class Day extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.DAY;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.DAY;
 
   Day(day) : super([day]);
 }
 
 class DayOfWeek extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.DAY_OF_WEEK;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.DAY_OF_WEEK;
 
   DayOfWeek(dow) : super([dow]);
 }
 
 class DayOfYear extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.DAY_OF_YEAR;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.DAY_OF_YEAR;
 
   DayOfYear(doy) : super([doy]);
 }
 
 class Hours extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.HOURS;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.HOURS;
 
   Hours(hours) : super([hours]);
 }
 
 class Minutes extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.MINUTES;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.MINUTES;
 
   Minutes(minutes) : super([minutes]);
 }
 
 class Seconds extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.SECONDS;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.SECONDS;
 
   Seconds(seconds) : super([seconds]);
 }
 
 class Binary extends RqlTopLevelQuery {
-  p.Term_TermType tt = p.Term_TermType.BINARY;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.BINARY;
   Binary(data) : super([data]);
 }
 
 class Time extends RqlTopLevelQuery {
-  p.Term_TermType tt = p.Term_TermType.TIME;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.TIME;
 
   Time(Args args) : super([args]);
 
@@ -1752,198 +1889,227 @@ class Time extends RqlTopLevelQuery {
 }
 
 class RqlISO8601 extends RqlTopLevelQuery {
-  p.Term_TermType tt = p.Term_TermType.ISO8601;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.ISO8601;
 
-  RqlISO8601(strTime, [defaultTimeZone = "Z"])
-      : super([strTime], {"default_timezone": defaultTimeZone});
+  RqlISO8601(strTime, [defaultTimeZone = 'Z'])
+      : super([strTime], {'default_timezone': defaultTimeZone});
 }
 
 class EpochTime extends RqlTopLevelQuery {
-  p.Term_TermType tt = p.Term_TermType.EPOCH_TIME;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.EPOCH_TIME;
 
   EpochTime(eptime) : super([eptime]);
 }
 
 class Now extends RqlTopLevelQuery {
-  p.Term_TermType tt = p.Term_TermType.NOW;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.NOW;
 
   Now() : super();
 }
 
 class InTimezone extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.IN_TIMEZONE;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.IN_TIMEZONE;
 
   InTimezone(zoneable, tz) : super([zoneable, tz]);
 }
 
 class ToEpochTime extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.TO_EPOCH_TIME;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.TO_EPOCH_TIME;
 
   ToEpochTime(obj) : super([obj]);
 }
 
 class Func extends RqlQuery {
-  p.Term_TermType tt = p.Term_TermType.FUNC;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.FUNC;
   Function fun;
   int argsCount;
   static int nextId = 0;
   Func(this.fun, this.argsCount) : super(null, null) {
-    List vrs = [];
-    List vrids = [];
+    var vrs = [];
+    var vrids = [];
 
-    for (int i = 0; i < argsCount; i++) {
+    for (var i = 0; i < argsCount; i++) {
       vrs.add(Var(Func.nextId));
       vrids.add(Func.nextId);
       Func.nextId++;
     }
 
-    this.args = [MakeArray(vrids), _expr(Function.apply(fun, vrs))];
+    args = [MakeArray(vrids), _expr(Function.apply(fun, vrs))];
   }
 }
 
 class Asc extends RqlTopLevelQuery {
-  p.Term_TermType tt = p.Term_TermType.ASC;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.ASC;
 
   Asc(obj) : super([obj]);
 }
 
 class Desc extends RqlTopLevelQuery {
-  p.Term_TermType tt = p.Term_TermType.DESC;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.DESC;
 
   Desc(attr) : super([attr]);
 }
 
 class Literal extends RqlTopLevelQuery {
-  p.Term_TermType tt = p.Term_TermType.LITERAL;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.LITERAL;
 
   Literal(attr) : super([attr]);
 }
 
 class Circle extends RqlTopLevelQuery {
-  p.Term_TermType tt = p.Term_TermType.CIRCLE;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.CIRCLE;
 
-  Circle(point, radius, [Map options]) : super([point, radius], options);
+  Circle(point, radius, [Map? options]) : super([point, radius], options);
 }
 
 class Distance extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.DISTANCE;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.DISTANCE;
 
-  Distance(obj, geo, [Map options]) : super([obj, geo], options);
+  Distance(obj, geo, [Map? options]) : super([obj, geo], options);
 }
 
 class Fill extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.FILL;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.FILL;
 
   Fill(obj) : super([obj]);
 }
 
 class GeoJson extends RqlTopLevelQuery {
-  p.Term_TermType tt = p.Term_TermType.GEOJSON;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.GEOJSON;
 
   GeoJson(Map geoJson) : super([geoJson]);
 }
 
 class ToGeoJson extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.TO_GEOJSON;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.TO_GEOJSON;
 
   ToGeoJson(obj) : super([obj]);
 }
 
 class GetIntersecting extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.GET_INTERSECTING;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.GET_INTERSECTING;
 
-  GetIntersecting(table, geo, [Map options]) : super([table, geo], options);
+  GetIntersecting(table, geo, [Map? options]) : super([table, geo], options);
 }
 
 class GetNearest extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.GET_NEAREST;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.GET_NEAREST;
 
-  GetNearest(table, point, Map options) : super([table, point], options);
+  GetNearest(table, point, Map? options) : super([table, point], options);
 }
 
 class Includes extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.INCLUDES;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.INCLUDES;
 
   Includes(obj, geo) : super([obj, geo]);
 }
 
 class Intersects extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.INTERSECTS;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.INTERSECTS;
 
   Intersects(obj, geo) : super([obj, geo]);
 }
 
 class Line extends RqlTopLevelQuery {
-  p.Term_TermType tt = p.Term_TermType.LINE;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.LINE;
 
   Line(points) : super(points);
 }
 
 class Point extends RqlTopLevelQuery {
-  p.Term_TermType tt = p.Term_TermType.POINT;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.POINT;
 
   Point(long, lat) : super([long, lat]);
 }
 
 class Polygon extends RqlTopLevelQuery {
-  p.Term_TermType tt = p.Term_TermType.POLYGON;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.POLYGON;
 
   Polygon(points) : super(points);
 }
 
 class PolygonSub extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.POLYGON_SUB;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.POLYGON_SUB;
 
   PolygonSub(var poly1, var poly2) : super([poly1, poly2]);
 }
 
 class Config extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.CONFIG;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.CONFIG;
 
   Config(obj) : super([obj]);
 }
 
 class Rebalance extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.REBALANCE;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.REBALANCE;
 
   Rebalance(obj) : super([obj]);
 }
 
 class Reconfigure extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.RECONFIGURE;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.RECONFIGURE;
 
   Reconfigure(obj, Map options) : super([obj], options);
 }
 
 class Status extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.STATUS;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.STATUS;
 
   Status(obj) : super([obj]);
 }
 
 class Wait extends RqlMethodQuery {
-  p.Term_TermType tt = p.Term_TermType.WAIT;
+  @override
+  p.Term_TermType? tt = p.Term_TermType.WAIT;
 
-  Wait(obj, [Map options]) : super([obj], options);
+  Wait(obj, [Map? options]) : super([obj], options);
 }
 
 class RqlTimeName extends RqlQuery {
-  p.Term_TermType tt;
+  @override
+  p.Term_TermType? tt;
 
   RqlTimeName(this.tt) : super();
 }
 
 class RqlConstant extends RqlQuery {
-  p.Term_TermType tt;
+  @override
+  p.Term_TermType? tt;
 
   RqlConstant(this.tt) : super();
 }
 
 class _RqlAllOptions {
   //list of every option from any term
-  List options;
+  late List options;
 
-  _RqlAllOptions(p.Term_TermType tt) {
+  _RqlAllOptions(p.Term_TermType? tt) {
     switch (tt) {
       case p.Term_TermType.TABLE_CREATE:
         options = ['primary_key', 'durability', 'datacenter'];
@@ -1964,7 +2130,7 @@ class _RqlAllOptions {
         options = ['read_mode'];
         break;
       case p.Term_TermType.INDEX_CREATE:
-        options = ["multi"];
+        options = ['multi'];
         break;
       case p.Term_TermType.GET_ALL:
         options = ['index'];
@@ -2030,7 +2196,7 @@ class _RqlAllOptions {
           'replicas',
           'primary_replica_tag',
           'dry_run',
-          "emergency_repair"
+          'emergency_repair'
         ];
         break;
       case p.Term_TermType.WAIT:
diff --git a/lib/src/cursor.dart b/lib/src/cursor.dart
index 89e8849..99eb1f4 100644
--- a/lib/src/cursor.dart
+++ b/lib/src/cursor.dart
@@ -1,12 +1,12 @@
 part of rethinkdb;
 
 class Cursor extends Stream {
-  Connection _conn;
-  Query _query;
-  Map _opts;
+  final Connection _conn;
+  final Query _query;
+  final Map _opts;
   int _outstandingRequests = 0;
   bool _endFlag = false;
-  StreamController _s = StreamController();
+  final StreamController _s = StreamController();
 
   Cursor(this._conn, this._query, this._opts);
 
@@ -16,7 +16,7 @@ class Cursor extends Stream {
     if (response._type != p.Response_ResponseType.SUCCESS_PARTIAL.value &&
         response._type != p.Response_ResponseType.SUCCESS_SEQUENCE.value) {
       _s.addError(
-          RqlDriverError("Unexpected response type received for cursor"), null);
+          RqlDriverError('Unexpected response type received for cursor'), null);
     }
 
     try {
@@ -30,8 +30,8 @@ class Cursor extends Stream {
     _s.addStream(Stream.fromIterable(convertedData)).then((f) {
       if (!_endFlag) {
         _outstandingRequests++;
-        Query query =
-            Query(p.Query_QueryType.CONTINUE, this._query._token, null, null);
+        var query =
+            Query(p.Query_QueryType.CONTINUE, _query._token, null, null);
         query._cursor = this;
         _conn._sendQueue.addLast(query);
         _conn._sendQuery();
@@ -43,41 +43,56 @@ class Cursor extends Stream {
 
   Future close() => _s.close();
 
-  StreamSubscription listen(Function onData,
-      {Function onError, Function onDone, bool cancelOnError}) {
-    return _s.stream.listen(onData,
-        onError: onError, onDone: onDone, cancelOnError: cancelOnError);
+  @override
+  StreamSubscription listen(Function? onData,
+      {Function? onError, Function? onDone, bool? cancelOnError}) {
+    return _s.stream.listen(onData as void Function(dynamic)?,
+        onError: onError,
+        onDone: onDone as void Function()?,
+        cancelOnError: cancelOnError);
   }
 }
 
 class Feed extends Cursor {
   Feed(conn, opts, query) : super(conn, opts, query);
 
-  toSet() => throw RqlDriverError("`toSet` is not available for feeds.");
-  toList() => throw RqlDriverError("`toList` is not available for feeds.");
+  @override
+  toSet() => throw RqlDriverError('`toSet` is not available for feeds.');
+  @override
+  toList() => throw RqlDriverError('`toList` is not available for feeds.');
+  @override
   toString() => "Instance of 'Feed'";
 }
 
 class UnionedFeed extends Cursor {
   UnionedFeed(conn, opts, query) : super(conn, opts, query);
 
-  toSet() => throw RqlDriverError("`toSet` is not available for feeds.");
-  toList() => throw RqlDriverError("`toList` is not available for feeds.");
+  @override
+  toSet() => throw RqlDriverError('`toSet` is not available for feeds.');
+  @override
+  toList() => throw RqlDriverError('`toList` is not available for feeds.');
+  @override
   toString() => "Instance of 'UnionedFeed'";
 }
 
 class AtomFeed extends Cursor {
   AtomFeed(conn, opts, query) : super(conn, opts, query);
 
-  toSet() => throw RqlDriverError("`toSet` is not available for feeds.");
-  toList() => throw RqlDriverError("`toList` is not available for feeds.");
+  @override
+  toSet() => throw RqlDriverError('`toSet` is not available for feeds.');
+  @override
+  toList() => throw RqlDriverError('`toList` is not available for feeds.');
+  @override
   toString() => "Instance of 'AtomFeed'";
 }
 
 class OrderByLimitFeed extends Cursor {
   OrderByLimitFeed(conn, opts, query) : super(conn, opts, query);
 
-  toSet() => throw RqlDriverError("`toSet` is not available for feeds.");
-  toList() => throw RqlDriverError("`toList` is not available for feeds.");
+  @override
+  toSet() => throw RqlDriverError('`toSet` is not available for feeds.');
+  @override
+  toList() => throw RqlDriverError('`toList` is not available for feeds.');
+  @override
   toString() => "Instance of 'OrderByLimitFeed'";
 }
diff --git a/lib/src/errors.dart b/lib/src/errors.dart
index a041165..192d77f 100644
--- a/lib/src/errors.dart
+++ b/lib/src/errors.dart
@@ -1,69 +1,71 @@
 part of rethinkdb;
 
 class RqlError implements Exception {
-  String message;
+  String? message;
   var term;
   var frames;
 
   RqlError(this.message, this.term, this.frames);
 
-  toString() => "${this.runtimeType}!\n\n$message\n\n$term\n\n$frames";
+  @override
+  toString() => '$runtimeType!\n\n$message\n\n$term\n\n$frames';
 }
 
 class RqlClientError extends RqlError {
-  RqlClientError(String message, term, frames) : super(message, term, frames);
+  RqlClientError(String? message, term, frames) : super(message, term, frames);
 }
 
 class RqlCompileError extends RqlError {
-  RqlCompileError(String message, term, frames) : super(message, term, frames);
+  RqlCompileError(String? message, term, frames) : super(message, term, frames);
 }
 
 class RqlRuntimeError extends RqlError {
-  RqlRuntimeError(String message, term, frames) : super(message, term, frames);
+  RqlRuntimeError(String? message, term, frames) : super(message, term, frames);
 }
 
 class RqlDriverError implements Exception {
   String message;
   RqlDriverError(this.message);
 
+  @override
   toString() => message;
 }
 
 class ReqlInternalError extends RqlRuntimeError {
-  ReqlInternalError(String message, term, frames)
+  ReqlInternalError(String? message, term, frames)
       : super(message, term, frames);
 }
 
 class ReqlResourceLimitError extends RqlRuntimeError {
-  ReqlResourceLimitError(String message, term, frames)
+  ReqlResourceLimitError(String? message, term, frames)
       : super(message, term, frames);
 }
 
 class ReqlQueryLogicError extends RqlRuntimeError {
-  ReqlQueryLogicError(String message, term, frames)
+  ReqlQueryLogicError(String? message, term, frames)
       : super(message, term, frames);
 }
 
 class ReqlNonExistenceError extends RqlRuntimeError {
-  ReqlNonExistenceError(String message, term, frames)
+  ReqlNonExistenceError(String? message, term, frames)
       : super(message, term, frames);
 }
 
 class ReqlOpFailedError extends RqlRuntimeError {
-  ReqlOpFailedError(String message, term, frames)
+  ReqlOpFailedError(String? message, term, frames)
       : super(message, term, frames);
 }
 
 class ReqlOpIndeterminateError extends RqlRuntimeError {
-  ReqlOpIndeterminateError(String message, term, frames)
+  ReqlOpIndeterminateError(String? message, term, frames)
       : super(message, term, frames);
 }
 
 class ReqlUserError extends RqlRuntimeError {
-  ReqlUserError(String message, term, frames) : super(message, term, frames);
+  ReqlUserError(String? message, term, frames) : super(message, term, frames);
 }
 
 class ReqlPermissionError extends RqlRuntimeError {
-  ReqlPermissionError(String message, term, frames)
+  ReqlPermissionError(String? message, term, frames)
       : super(message, term, frames);
 }
diff --git a/lib/src/generated/ql2.pb.dart b/lib/src/generated/ql2.pb.dart
index 79d9248..d6367d4 100644
--- a/lib/src/generated/ql2.pb.dart
+++ b/lib/src/generated/ql2.pb.dart
@@ -2,13 +2,12 @@
 //  Generated code. Do not modify.
 //  source: ql2.proto
 //
-// @dart = 2.3
-// ignore_for_file: camel_case_types,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type
+// @dart = 2.12
+// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields
 
-import 'dart:core' as $core
-    show bool, Deprecated, double, int, List, Map, override, pragma, String;
+import 'dart:core' as $core;
 
-import 'package:fixnum/fixnum.dart';
+import 'package:fixnum/fixnum.dart' as $fixnum;
 import 'package:protobuf/protobuf.dart' as $pb;
 
 import 'ql2.pbenum.dart';
@@ -16,7 +15,11 @@ import 'ql2.pbenum.dart';
 export 'ql2.pbenum.dart';
 
 class VersionDummy extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo('VersionDummy')
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      const $core.bool.fromEnvironment('protobuf.omit_message_names')
+          ? ''
+          : 'VersionDummy',
+      createEmptyInstance: create)
     ..hasRequiredFields = false;
 
   VersionDummy._() : super();
@@ -27,506 +30,1081 @@ class VersionDummy extends $pb.GeneratedMessage {
   factory VersionDummy.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
   VersionDummy clone() => VersionDummy()..mergeFromMessage(this);
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
   VersionDummy copyWith(void Function(VersionDummy) updates) =>
-      super.copyWith((message) => updates(message as VersionDummy));
+      super.copyWith((message) => updates(message as VersionDummy))
+          as VersionDummy; // ignore: deprecated_member_use
   $pb.BuilderInfo get info_ => _i;
   @$core.pragma('dart2js:noInline')
   static VersionDummy create() => VersionDummy._();
   VersionDummy createEmptyInstance() => create();
   static $pb.PbList<VersionDummy> createRepeated() =>
       $pb.PbList<VersionDummy>();
-  static VersionDummy getDefault() => _defaultInstance ??= create()..freeze();
-  static VersionDummy _defaultInstance;
+  @$core.pragma('dart2js:noInline')
+  static VersionDummy getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<VersionDummy>(create);
+  static VersionDummy? _defaultInstance;
 }
 
 class Query_AssocPair extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo('Query.AssocPair')
-    ..aOS(1, 'key')
-    ..a<Term>(2, 'val', $pb.PbFieldType.OM, Term.getDefault, Term.create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      const $core.bool.fromEnvironment('protobuf.omit_message_names')
+          ? ''
+          : 'Query.AssocPair',
+      createEmptyInstance: create)
+    ..aOS(
+        1,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'key')
+    ..aOM<Term>(
+        2,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'val',
+        subBuilder: Term.create)
     ..hasRequiredFields = false;
 
   Query_AssocPair._() : super();
-  factory Query_AssocPair() => create();
+  factory Query_AssocPair({
+    $core.String? key,
+    Term? val,
+  }) {
+    final _result = create();
+    if (key != null) {
+      _result.key = key;
+    }
+    if (val != null) {
+      _result.val = val;
+    }
+    return _result;
+  }
   factory Query_AssocPair.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory Query_AssocPair.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
   Query_AssocPair clone() => Query_AssocPair()..mergeFromMessage(this);
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
   Query_AssocPair copyWith(void Function(Query_AssocPair) updates) =>
-      super.copyWith((message) => updates(message as Query_AssocPair));
+      super.copyWith((message) => updates(message as Query_AssocPair))
+          as Query_AssocPair; // ignore: deprecated_member_use
   $pb.BuilderInfo get info_ => _i;
   @$core.pragma('dart2js:noInline')
   static Query_AssocPair create() => Query_AssocPair._();
   Query_AssocPair createEmptyInstance() => create();
   static $pb.PbList<Query_AssocPair> createRepeated() =>
       $pb.PbList<Query_AssocPair>();
-  static Query_AssocPair getDefault() =>
-      _defaultInstance ??= create()..freeze();
-  static Query_AssocPair _defaultInstance;
+  @$core.pragma('dart2js:noInline')
+  static Query_AssocPair getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<Query_AssocPair>(create);
+  static Query_AssocPair? _defaultInstance;
 
-  $core.String get key => $_getS(0, '');
+  @$pb.TagNumber(1)
+  $core.String get key => $_getSZ(0);
+  @$pb.TagNumber(1)
   set key($core.String v) {
     $_setString(0, v);
   }
 
+  @$pb.TagNumber(1)
   $core.bool hasKey() => $_has(0);
+  @$pb.TagNumber(1)
   void clearKey() => clearField(1);
 
+  @$pb.TagNumber(2)
   Term get val => $_getN(1);
+  @$pb.TagNumber(2)
   set val(Term v) {
     setField(2, v);
   }
 
+  @$pb.TagNumber(2)
   $core.bool hasVal() => $_has(1);
+  @$pb.TagNumber(2)
   void clearVal() => clearField(2);
+  @$pb.TagNumber(2)
+  Term ensureVal() => $_ensure(1);
 }
 
 class Query extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo('Query')
-    ..e<Query_QueryType>(1, 'type', $pb.PbFieldType.OE, Query_QueryType.START,
-        Query_QueryType.valueOf, Query_QueryType.values)
-    ..a<Term>(2, 'query', $pb.PbFieldType.OM, Term.getDefault, Term.create)
-    ..aInt64(3, 'token')
-    ..aOB(4, 'oBSOLETENoreply')
-    ..aOB(5, 'acceptsRJson')
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      const $core.bool.fromEnvironment('protobuf.omit_message_names')
+          ? ''
+          : 'Query',
+      createEmptyInstance: create)
+    ..e<Query_QueryType>(
+        1,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'type',
+        $pb.PbFieldType.OE,
+        defaultOrMaker: Query_QueryType.START,
+        valueOf: Query_QueryType.valueOf,
+        enumValues: Query_QueryType.values)
+    ..aOM<Term>(
+        2,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'query',
+        subBuilder: Term.create)
+    ..aInt64(
+        3,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'token')
+    ..aOB(
+        4,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'OBSOLETENoreply',
+        protoName: 'OBSOLETE_noreply')
+    ..aOB(
+        5,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'acceptsRJson')
     ..pc<Query_AssocPair>(
-        6, 'globalOptargs', $pb.PbFieldType.PM, Query_AssocPair.create)
+        6,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'globalOptargs',
+        $pb.PbFieldType.PM,
+        subBuilder: Query_AssocPair.create)
     ..hasRequiredFields = false;
 
   Query._() : super();
-  factory Query() => create();
+  factory Query({
+    Query_QueryType? type,
+    Term? query,
+    $fixnum.Int64? token,
+    $core.bool? oBSOLETENoreply,
+    $core.bool? acceptsRJson,
+    $core.Iterable<Query_AssocPair>? globalOptargs,
+  }) {
+    final _result = create();
+    if (type != null) {
+      _result.type = type;
+    }
+    if (query != null) {
+      _result.query = query;
+    }
+    if (token != null) {
+      _result.token = token;
+    }
+    if (oBSOLETENoreply != null) {
+      _result.oBSOLETENoreply = oBSOLETENoreply;
+    }
+    if (acceptsRJson != null) {
+      _result.acceptsRJson = acceptsRJson;
+    }
+    if (globalOptargs != null) {
+      _result.globalOptargs.addAll(globalOptargs);
+    }
+    return _result;
+  }
   factory Query.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory Query.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
   Query clone() => Query()..mergeFromMessage(this);
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
   Query copyWith(void Function(Query) updates) =>
-      super.copyWith((message) => updates(message as Query));
+      super.copyWith((message) => updates(message as Query))
+          as Query; // ignore: deprecated_member_use
   $pb.BuilderInfo get info_ => _i;
   @$core.pragma('dart2js:noInline')
   static Query create() => Query._();
   Query createEmptyInstance() => create();
   static $pb.PbList<Query> createRepeated() => $pb.PbList<Query>();
-  static Query getDefault() => _defaultInstance ??= create()..freeze();
-  static Query _defaultInstance;
+  @$core.pragma('dart2js:noInline')
+  static Query getDefault() =>
+      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Query>(create);
+  static Query? _defaultInstance;
 
+  @$pb.TagNumber(1)
   Query_QueryType get type => $_getN(0);
+  @$pb.TagNumber(1)
   set type(Query_QueryType v) {
     setField(1, v);
   }
 
+  @$pb.TagNumber(1)
   $core.bool hasType() => $_has(0);
+  @$pb.TagNumber(1)
   void clearType() => clearField(1);
 
+  @$pb.TagNumber(2)
   Term get query => $_getN(1);
+  @$pb.TagNumber(2)
   set query(Term v) {
     setField(2, v);
   }
 
+  @$pb.TagNumber(2)
   $core.bool hasQuery() => $_has(1);
+  @$pb.TagNumber(2)
   void clearQuery() => clearField(2);
+  @$pb.TagNumber(2)
+  Term ensureQuery() => $_ensure(1);
 
-  Int64 get token => $_getI64(2);
-  set token(Int64 v) {
+  @$pb.TagNumber(3)
+  $fixnum.Int64 get token => $_getI64(2);
+  @$pb.TagNumber(3)
+  set token($fixnum.Int64 v) {
     $_setInt64(2, v);
   }
 
+  @$pb.TagNumber(3)
   $core.bool hasToken() => $_has(2);
+  @$pb.TagNumber(3)
   void clearToken() => clearField(3);
 
-  $core.bool get oBSOLETENoreply => $_get(3, false);
+  @$pb.TagNumber(4)
+  $core.bool get oBSOLETENoreply => $_getBF(3);
+  @$pb.TagNumber(4)
   set oBSOLETENoreply($core.bool v) {
     $_setBool(3, v);
   }
 
+  @$pb.TagNumber(4)
   $core.bool hasOBSOLETENoreply() => $_has(3);
+  @$pb.TagNumber(4)
   void clearOBSOLETENoreply() => clearField(4);
 
-  $core.bool get acceptsRJson => $_get(4, false);
+  @$pb.TagNumber(5)
+  $core.bool get acceptsRJson => $_getBF(4);
+  @$pb.TagNumber(5)
   set acceptsRJson($core.bool v) {
     $_setBool(4, v);
   }
 
+  @$pb.TagNumber(5)
   $core.bool hasAcceptsRJson() => $_has(4);
+  @$pb.TagNumber(5)
   void clearAcceptsRJson() => clearField(5);
 
+  @$pb.TagNumber(6)
   $core.List<Query_AssocPair> get globalOptargs => $_getList(5);
 }
 
 class Frame extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo('Frame')
-    ..e<Frame_FrameType>(1, 'type', $pb.PbFieldType.OE, Frame_FrameType.POS,
-        Frame_FrameType.valueOf, Frame_FrameType.values)
-    ..aInt64(2, 'pos')
-    ..aOS(3, 'opt')
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      const $core.bool.fromEnvironment('protobuf.omit_message_names')
+          ? ''
+          : 'Frame',
+      createEmptyInstance: create)
+    ..e<Frame_FrameType>(
+        1,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'type',
+        $pb.PbFieldType.OE,
+        defaultOrMaker: Frame_FrameType.POS,
+        valueOf: Frame_FrameType.valueOf,
+        enumValues: Frame_FrameType.values)
+    ..aInt64(
+        2,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'pos')
+    ..aOS(
+        3,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'opt')
     ..hasRequiredFields = false;
 
   Frame._() : super();
-  factory Frame() => create();
+  factory Frame({
+    Frame_FrameType? type,
+    $fixnum.Int64? pos,
+    $core.String? opt,
+  }) {
+    final _result = create();
+    if (type != null) {
+      _result.type = type;
+    }
+    if (pos != null) {
+      _result.pos = pos;
+    }
+    if (opt != null) {
+      _result.opt = opt;
+    }
+    return _result;
+  }
   factory Frame.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory Frame.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
   Frame clone() => Frame()..mergeFromMessage(this);
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
   Frame copyWith(void Function(Frame) updates) =>
-      super.copyWith((message) => updates(message as Frame));
+      super.copyWith((message) => updates(message as Frame))
+          as Frame; // ignore: deprecated_member_use
   $pb.BuilderInfo get info_ => _i;
   @$core.pragma('dart2js:noInline')
   static Frame create() => Frame._();
   Frame createEmptyInstance() => create();
   static $pb.PbList<Frame> createRepeated() => $pb.PbList<Frame>();
-  static Frame getDefault() => _defaultInstance ??= create()..freeze();
-  static Frame _defaultInstance;
+  @$core.pragma('dart2js:noInline')
+  static Frame getDefault() =>
+      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Frame>(create);
+  static Frame? _defaultInstance;
 
+  @$pb.TagNumber(1)
   Frame_FrameType get type => $_getN(0);
+  @$pb.TagNumber(1)
   set type(Frame_FrameType v) {
     setField(1, v);
   }
 
+  @$pb.TagNumber(1)
   $core.bool hasType() => $_has(0);
+  @$pb.TagNumber(1)
   void clearType() => clearField(1);
 
-  Int64 get pos => $_getI64(1);
-  set pos(Int64 v) {
+  @$pb.TagNumber(2)
+  $fixnum.Int64 get pos => $_getI64(1);
+  @$pb.TagNumber(2)
+  set pos($fixnum.Int64 v) {
     $_setInt64(1, v);
   }
 
+  @$pb.TagNumber(2)
   $core.bool hasPos() => $_has(1);
+  @$pb.TagNumber(2)
   void clearPos() => clearField(2);
 
-  $core.String get opt => $_getS(2, '');
+  @$pb.TagNumber(3)
+  $core.String get opt => $_getSZ(2);
+  @$pb.TagNumber(3)
   set opt($core.String v) {
     $_setString(2, v);
   }
 
+  @$pb.TagNumber(3)
   $core.bool hasOpt() => $_has(2);
+  @$pb.TagNumber(3)
   void clearOpt() => clearField(3);
 }
 
 class Backtrace extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo('Backtrace')
-    ..pc<Frame>(1, 'frames', $pb.PbFieldType.PM, Frame.create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      const $core.bool.fromEnvironment('protobuf.omit_message_names')
+          ? ''
+          : 'Backtrace',
+      createEmptyInstance: create)
+    ..pc<Frame>(
+        1,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'frames',
+        $pb.PbFieldType.PM,
+        subBuilder: Frame.create)
     ..hasRequiredFields = false;
 
   Backtrace._() : super();
-  factory Backtrace() => create();
+  factory Backtrace({
+    $core.Iterable<Frame>? frames,
+  }) {
+    final _result = create();
+    if (frames != null) {
+      _result.frames.addAll(frames);
+    }
+    return _result;
+  }
   factory Backtrace.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory Backtrace.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
   Backtrace clone() => Backtrace()..mergeFromMessage(this);
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
   Backtrace copyWith(void Function(Backtrace) updates) =>
-      super.copyWith((message) => updates(message as Backtrace));
+      super.copyWith((message) => updates(message as Backtrace))
+          as Backtrace; // ignore: deprecated_member_use
   $pb.BuilderInfo get info_ => _i;
   @$core.pragma('dart2js:noInline')
   static Backtrace create() => Backtrace._();
   Backtrace createEmptyInstance() => create();
   static $pb.PbList<Backtrace> createRepeated() => $pb.PbList<Backtrace>();
-  static Backtrace getDefault() => _defaultInstance ??= create()..freeze();
-  static Backtrace _defaultInstance;
+  @$core.pragma('dart2js:noInline')
+  static Backtrace getDefault() =>
+      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Backtrace>(create);
+  static Backtrace? _defaultInstance;
 
+  @$pb.TagNumber(1)
   $core.List<Frame> get frames => $_getList(0);
 }
 
 class Response extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo('Response')
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      const $core.bool.fromEnvironment('protobuf.omit_message_names')
+          ? ''
+          : 'Response',
+      createEmptyInstance: create)
     ..e<Response_ResponseType>(
         1,
-        'type',
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'type',
         $pb.PbFieldType.OE,
-        Response_ResponseType.SUCCESS_ATOM,
-        Response_ResponseType.valueOf,
-        Response_ResponseType.values)
-    ..aInt64(2, 'token')
-    ..pc<Datum>(3, 'response', $pb.PbFieldType.PM, Datum.create)
-    ..a<Backtrace>(4, 'backtrace', $pb.PbFieldType.OM, Backtrace.getDefault,
-        Backtrace.create)
-    ..a<Datum>(5, 'profile', $pb.PbFieldType.OM, Datum.getDefault, Datum.create)
-    ..pc<Response_ResponseNote>(6, 'notes', $pb.PbFieldType.PE, null,
-        Response_ResponseNote.valueOf, Response_ResponseNote.values)
+        defaultOrMaker: Response_ResponseType.SUCCESS_ATOM,
+        valueOf: Response_ResponseType.valueOf,
+        enumValues: Response_ResponseType.values)
+    ..aInt64(
+        2,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'token')
+    ..pc<Datum>(
+        3,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'response',
+        $pb.PbFieldType.PM,
+        subBuilder: Datum.create)
+    ..aOM<Backtrace>(
+        4,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'backtrace',
+        subBuilder: Backtrace.create)
+    ..aOM<Datum>(
+        5,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'profile',
+        subBuilder: Datum.create)
+    ..pc<Response_ResponseNote>(
+        6,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'notes',
+        $pb.PbFieldType.PE,
+        valueOf: Response_ResponseNote.valueOf,
+        enumValues: Response_ResponseNote.values)
     ..e<Response_ErrorType>(
         7,
-        'errorType',
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'errorType',
         $pb.PbFieldType.OE,
-        Response_ErrorType.INTERNAL,
-        Response_ErrorType.valueOf,
-        Response_ErrorType.values)
+        defaultOrMaker: Response_ErrorType.INTERNAL,
+        valueOf: Response_ErrorType.valueOf,
+        enumValues: Response_ErrorType.values)
     ..hasRequiredFields = false;
 
   Response._() : super();
-  factory Response() => create();
+  factory Response({
+    Response_ResponseType? type,
+    $fixnum.Int64? token,
+    $core.Iterable<Datum>? response,
+    Backtrace? backtrace,
+    Datum? profile,
+    $core.Iterable<Response_ResponseNote>? notes,
+    Response_ErrorType? errorType,
+  }) {
+    final _result = create();
+    if (type != null) {
+      _result.type = type;
+    }
+    if (token != null) {
+      _result.token = token;
+    }
+    if (response != null) {
+      _result.response.addAll(response);
+    }
+    if (backtrace != null) {
+      _result.backtrace = backtrace;
+    }
+    if (profile != null) {
+      _result.profile = profile;
+    }
+    if (notes != null) {
+      _result.notes.addAll(notes);
+    }
+    if (errorType != null) {
+      _result.errorType = errorType;
+    }
+    return _result;
+  }
   factory Response.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory Response.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
   Response clone() => Response()..mergeFromMessage(this);
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
   Response copyWith(void Function(Response) updates) =>
-      super.copyWith((message) => updates(message as Response));
+      super.copyWith((message) => updates(message as Response))
+          as Response; // ignore: deprecated_member_use
   $pb.BuilderInfo get info_ => _i;
   @$core.pragma('dart2js:noInline')
   static Response create() => Response._();
   Response createEmptyInstance() => create();
   static $pb.PbList<Response> createRepeated() => $pb.PbList<Response>();
-  static Response getDefault() => _defaultInstance ??= create()..freeze();
-  static Response _defaultInstance;
+  @$core.pragma('dart2js:noInline')
+  static Response getDefault() =>
+      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Response>(create);
+  static Response? _defaultInstance;
 
+  @$pb.TagNumber(1)
   Response_ResponseType get type => $_getN(0);
+  @$pb.TagNumber(1)
   set type(Response_ResponseType v) {
     setField(1, v);
   }
 
+  @$pb.TagNumber(1)
   $core.bool hasType() => $_has(0);
+  @$pb.TagNumber(1)
   void clearType() => clearField(1);
 
-  Int64 get token => $_getI64(1);
-  set token(Int64 v) {
+  @$pb.TagNumber(2)
+  $fixnum.Int64 get token => $_getI64(1);
+  @$pb.TagNumber(2)
+  set token($fixnum.Int64 v) {
     $_setInt64(1, v);
   }
 
+  @$pb.TagNumber(2)
   $core.bool hasToken() => $_has(1);
+  @$pb.TagNumber(2)
   void clearToken() => clearField(2);
 
+  @$pb.TagNumber(3)
   $core.List<Datum> get response => $_getList(2);
 
+  @$pb.TagNumber(4)
   Backtrace get backtrace => $_getN(3);
+  @$pb.TagNumber(4)
   set backtrace(Backtrace v) {
     setField(4, v);
   }
 
+  @$pb.TagNumber(4)
   $core.bool hasBacktrace() => $_has(3);
+  @$pb.TagNumber(4)
   void clearBacktrace() => clearField(4);
+  @$pb.TagNumber(4)
+  Backtrace ensureBacktrace() => $_ensure(3);
 
+  @$pb.TagNumber(5)
   Datum get profile => $_getN(4);
+  @$pb.TagNumber(5)
   set profile(Datum v) {
     setField(5, v);
   }
 
+  @$pb.TagNumber(5)
   $core.bool hasProfile() => $_has(4);
+  @$pb.TagNumber(5)
   void clearProfile() => clearField(5);
+  @$pb.TagNumber(5)
+  Datum ensureProfile() => $_ensure(4);
 
+  @$pb.TagNumber(6)
   $core.List<Response_ResponseNote> get notes => $_getList(5);
 
+  @$pb.TagNumber(7)
   Response_ErrorType get errorType => $_getN(6);
+  @$pb.TagNumber(7)
   set errorType(Response_ErrorType v) {
     setField(7, v);
   }
 
+  @$pb.TagNumber(7)
   $core.bool hasErrorType() => $_has(6);
+  @$pb.TagNumber(7)
   void clearErrorType() => clearField(7);
 }
 
 class Datum_AssocPair extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo('Datum.AssocPair')
-    ..aOS(1, 'key')
-    ..a<Datum>(2, 'val', $pb.PbFieldType.OM, Datum.getDefault, Datum.create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      const $core.bool.fromEnvironment('protobuf.omit_message_names')
+          ? ''
+          : 'Datum.AssocPair',
+      createEmptyInstance: create)
+    ..aOS(
+        1,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'key')
+    ..aOM<Datum>(
+        2,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'val',
+        subBuilder: Datum.create)
     ..hasRequiredFields = false;
 
   Datum_AssocPair._() : super();
-  factory Datum_AssocPair() => create();
+  factory Datum_AssocPair({
+    $core.String? key,
+    Datum? val,
+  }) {
+    final _result = create();
+    if (key != null) {
+      _result.key = key;
+    }
+    if (val != null) {
+      _result.val = val;
+    }
+    return _result;
+  }
   factory Datum_AssocPair.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory Datum_AssocPair.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
   Datum_AssocPair clone() => Datum_AssocPair()..mergeFromMessage(this);
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
   Datum_AssocPair copyWith(void Function(Datum_AssocPair) updates) =>
-      super.copyWith((message) => updates(message as Datum_AssocPair));
+      super.copyWith((message) => updates(message as Datum_AssocPair))
+          as Datum_AssocPair; // ignore: deprecated_member_use
   $pb.BuilderInfo get info_ => _i;
   @$core.pragma('dart2js:noInline')
   static Datum_AssocPair create() => Datum_AssocPair._();
   Datum_AssocPair createEmptyInstance() => create();
   static $pb.PbList<Datum_AssocPair> createRepeated() =>
       $pb.PbList<Datum_AssocPair>();
-  static Datum_AssocPair getDefault() =>
-      _defaultInstance ??= create()..freeze();
-  static Datum_AssocPair _defaultInstance;
+  @$core.pragma('dart2js:noInline')
+  static Datum_AssocPair getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<Datum_AssocPair>(create);
+  static Datum_AssocPair? _defaultInstance;
 
-  $core.String get key => $_getS(0, '');
+  @$pb.TagNumber(1)
+  $core.String get key => $_getSZ(0);
+  @$pb.TagNumber(1)
   set key($core.String v) {
     $_setString(0, v);
   }
 
+  @$pb.TagNumber(1)
   $core.bool hasKey() => $_has(0);
+  @$pb.TagNumber(1)
   void clearKey() => clearField(1);
 
+  @$pb.TagNumber(2)
   Datum get val => $_getN(1);
+  @$pb.TagNumber(2)
   set val(Datum v) {
     setField(2, v);
   }
 
+  @$pb.TagNumber(2)
   $core.bool hasVal() => $_has(1);
+  @$pb.TagNumber(2)
   void clearVal() => clearField(2);
+  @$pb.TagNumber(2)
+  Datum ensureVal() => $_ensure(1);
 }
 
 class Datum extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo('Datum')
-    ..e<Datum_DatumType>(1, 'type', $pb.PbFieldType.OE, Datum_DatumType.R_NULL,
-        Datum_DatumType.valueOf, Datum_DatumType.values)
-    ..aOB(2, 'rBool')
-    ..a<$core.double>(3, 'rNum', $pb.PbFieldType.OD)
-    ..aOS(4, 'rStr')
-    ..pc<Datum>(5, 'rArray', $pb.PbFieldType.PM, Datum.create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      const $core.bool.fromEnvironment('protobuf.omit_message_names')
+          ? ''
+          : 'Datum',
+      createEmptyInstance: create)
+    ..e<Datum_DatumType>(
+        1,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'type',
+        $pb.PbFieldType.OE,
+        defaultOrMaker: Datum_DatumType.R_NULL,
+        valueOf: Datum_DatumType.valueOf,
+        enumValues: Datum_DatumType.values)
+    ..aOB(
+        2,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'rBool')
+    ..a<$core.double>(
+        3,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'rNum',
+        $pb.PbFieldType.OD)
+    ..aOS(
+        4,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'rStr')
+    ..pc<Datum>(
+        5,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'rArray',
+        $pb.PbFieldType.PM,
+        subBuilder: Datum.create)
     ..pc<Datum_AssocPair>(
-        6, 'rObject', $pb.PbFieldType.PM, Datum_AssocPair.create)
+        6,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'rObject',
+        $pb.PbFieldType.PM,
+        subBuilder: Datum_AssocPair.create)
     ..hasRequiredFields = false;
 
   Datum._() : super();
-  factory Datum() => create();
+  factory Datum({
+    Datum_DatumType? type,
+    $core.bool? rBool,
+    $core.double? rNum,
+    $core.String? rStr,
+    $core.Iterable<Datum>? rArray,
+    $core.Iterable<Datum_AssocPair>? rObject,
+  }) {
+    final _result = create();
+    if (type != null) {
+      _result.type = type;
+    }
+    if (rBool != null) {
+      _result.rBool = rBool;
+    }
+    if (rNum != null) {
+      _result.rNum = rNum;
+    }
+    if (rStr != null) {
+      _result.rStr = rStr;
+    }
+    if (rArray != null) {
+      _result.rArray.addAll(rArray);
+    }
+    if (rObject != null) {
+      _result.rObject.addAll(rObject);
+    }
+    return _result;
+  }
   factory Datum.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory Datum.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
   Datum clone() => Datum()..mergeFromMessage(this);
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
   Datum copyWith(void Function(Datum) updates) =>
-      super.copyWith((message) => updates(message as Datum));
+      super.copyWith((message) => updates(message as Datum))
+          as Datum; // ignore: deprecated_member_use
   $pb.BuilderInfo get info_ => _i;
   @$core.pragma('dart2js:noInline')
   static Datum create() => Datum._();
   Datum createEmptyInstance() => create();
   static $pb.PbList<Datum> createRepeated() => $pb.PbList<Datum>();
-  static Datum getDefault() => _defaultInstance ??= create()..freeze();
-  static Datum _defaultInstance;
+  @$core.pragma('dart2js:noInline')
+  static Datum getDefault() =>
+      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Datum>(create);
+  static Datum? _defaultInstance;
 
+  @$pb.TagNumber(1)
   Datum_DatumType get type => $_getN(0);
+  @$pb.TagNumber(1)
   set type(Datum_DatumType v) {
     setField(1, v);
   }
 
+  @$pb.TagNumber(1)
   $core.bool hasType() => $_has(0);
+  @$pb.TagNumber(1)
   void clearType() => clearField(1);
 
-  $core.bool get rBool => $_get(1, false);
+  @$pb.TagNumber(2)
+  $core.bool get rBool => $_getBF(1);
+  @$pb.TagNumber(2)
   set rBool($core.bool v) {
     $_setBool(1, v);
   }
 
+  @$pb.TagNumber(2)
   $core.bool hasRBool() => $_has(1);
+  @$pb.TagNumber(2)
   void clearRBool() => clearField(2);
 
+  @$pb.TagNumber(3)
   $core.double get rNum => $_getN(2);
+  @$pb.TagNumber(3)
   set rNum($core.double v) {
     $_setDouble(2, v);
   }
 
+  @$pb.TagNumber(3)
   $core.bool hasRNum() => $_has(2);
+  @$pb.TagNumber(3)
   void clearRNum() => clearField(3);
 
-  $core.String get rStr => $_getS(3, '');
+  @$pb.TagNumber(4)
+  $core.String get rStr => $_getSZ(3);
+  @$pb.TagNumber(4)
   set rStr($core.String v) {
     $_setString(3, v);
   }
 
+  @$pb.TagNumber(4)
   $core.bool hasRStr() => $_has(3);
+  @$pb.TagNumber(4)
   void clearRStr() => clearField(4);
 
+  @$pb.TagNumber(5)
   $core.List<Datum> get rArray => $_getList(4);
 
+  @$pb.TagNumber(6)
   $core.List<Datum_AssocPair> get rObject => $_getList(5);
 }
 
 class Term_AssocPair extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo('Term.AssocPair')
-    ..aOS(1, 'key')
-    ..a<Term>(2, 'val', $pb.PbFieldType.OM, Term.getDefault, Term.create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      const $core.bool.fromEnvironment('protobuf.omit_message_names')
+          ? ''
+          : 'Term.AssocPair',
+      createEmptyInstance: create)
+    ..aOS(
+        1,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'key')
+    ..aOM<Term>(
+        2,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'val',
+        subBuilder: Term.create)
     ..hasRequiredFields = false;
 
   Term_AssocPair._() : super();
-  factory Term_AssocPair() => create();
+  factory Term_AssocPair({
+    $core.String? key,
+    Term? val,
+  }) {
+    final _result = create();
+    if (key != null) {
+      _result.key = key;
+    }
+    if (val != null) {
+      _result.val = val;
+    }
+    return _result;
+  }
   factory Term_AssocPair.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory Term_AssocPair.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
   Term_AssocPair clone() => Term_AssocPair()..mergeFromMessage(this);
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
   Term_AssocPair copyWith(void Function(Term_AssocPair) updates) =>
-      super.copyWith((message) => updates(message as Term_AssocPair));
+      super.copyWith((message) => updates(message as Term_AssocPair))
+          as Term_AssocPair; // ignore: deprecated_member_use
   $pb.BuilderInfo get info_ => _i;
   @$core.pragma('dart2js:noInline')
   static Term_AssocPair create() => Term_AssocPair._();
   Term_AssocPair createEmptyInstance() => create();
   static $pb.PbList<Term_AssocPair> createRepeated() =>
       $pb.PbList<Term_AssocPair>();
-  static Term_AssocPair getDefault() => _defaultInstance ??= create()..freeze();
-  static Term_AssocPair _defaultInstance;
+  @$core.pragma('dart2js:noInline')
+  static Term_AssocPair getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<Term_AssocPair>(create);
+  static Term_AssocPair? _defaultInstance;
 
-  $core.String get key => $_getS(0, '');
+  @$pb.TagNumber(1)
+  $core.String get key => $_getSZ(0);
+  @$pb.TagNumber(1)
   set key($core.String v) {
     $_setString(0, v);
   }
 
+  @$pb.TagNumber(1)
   $core.bool hasKey() => $_has(0);
+  @$pb.TagNumber(1)
   void clearKey() => clearField(1);
 
+  @$pb.TagNumber(2)
   Term get val => $_getN(1);
+  @$pb.TagNumber(2)
   set val(Term v) {
     setField(2, v);
   }
 
+  @$pb.TagNumber(2)
   $core.bool hasVal() => $_has(1);
+  @$pb.TagNumber(2)
   void clearVal() => clearField(2);
+  @$pb.TagNumber(2)
+  Term ensureVal() => $_ensure(1);
 }
 
 class Term extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo('Term')
-    ..e<Term_TermType>(1, 'type', $pb.PbFieldType.OE, Term_TermType.DATUM,
-        Term_TermType.valueOf, Term_TermType.values)
-    ..a<Datum>(2, 'datum', $pb.PbFieldType.OM, Datum.getDefault, Datum.create)
-    ..pc<Term>(3, 'args', $pb.PbFieldType.PM, Term.create)
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      const $core.bool.fromEnvironment('protobuf.omit_message_names')
+          ? ''
+          : 'Term',
+      createEmptyInstance: create)
+    ..e<Term_TermType>(
+        1,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'type',
+        $pb.PbFieldType.OE,
+        defaultOrMaker: Term_TermType.DATUM,
+        valueOf: Term_TermType.valueOf,
+        enumValues: Term_TermType.values)
+    ..aOM<Datum>(
+        2,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'datum',
+        subBuilder: Datum.create)
+    ..pc<Term>(
+        3,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'args',
+        $pb.PbFieldType.PM,
+        subBuilder: Term.create)
     ..pc<Term_AssocPair>(
-        4, 'optargs', $pb.PbFieldType.PM, Term_AssocPair.create)
+        4,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'optargs',
+        $pb.PbFieldType.PM,
+        subBuilder: Term_AssocPair.create)
     ..hasRequiredFields = false;
 
   Term._() : super();
-  factory Term() => create();
+  factory Term({
+    Term_TermType? type,
+    Datum? datum,
+    $core.Iterable<Term>? args,
+    $core.Iterable<Term_AssocPair>? optargs,
+  }) {
+    final _result = create();
+    if (type != null) {
+      _result.type = type;
+    }
+    if (datum != null) {
+      _result.datum = datum;
+    }
+    if (args != null) {
+      _result.args.addAll(args);
+    }
+    if (optargs != null) {
+      _result.optargs.addAll(optargs);
+    }
+    return _result;
+  }
   factory Term.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory Term.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
   Term clone() => Term()..mergeFromMessage(this);
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
   Term copyWith(void Function(Term) updates) =>
-      super.copyWith((message) => updates(message as Term));
+      super.copyWith((message) => updates(message as Term))
+          as Term; // ignore: deprecated_member_use
   $pb.BuilderInfo get info_ => _i;
   @$core.pragma('dart2js:noInline')
   static Term create() => Term._();
   Term createEmptyInstance() => create();
   static $pb.PbList<Term> createRepeated() => $pb.PbList<Term>();
-  static Term getDefault() => _defaultInstance ??= create()..freeze();
-  static Term _defaultInstance;
+  @$core.pragma('dart2js:noInline')
+  static Term getDefault() =>
+      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Term>(create);
+  static Term? _defaultInstance;
 
+  @$pb.TagNumber(1)
   Term_TermType get type => $_getN(0);
+  @$pb.TagNumber(1)
   set type(Term_TermType v) {
     setField(1, v);
   }
 
+  @$pb.TagNumber(1)
   $core.bool hasType() => $_has(0);
+  @$pb.TagNumber(1)
   void clearType() => clearField(1);
 
+  @$pb.TagNumber(2)
   Datum get datum => $_getN(1);
+  @$pb.TagNumber(2)
   set datum(Datum v) {
     setField(2, v);
   }
 
+  @$pb.TagNumber(2)
   $core.bool hasDatum() => $_has(1);
+  @$pb.TagNumber(2)
   void clearDatum() => clearField(2);
+  @$pb.TagNumber(2)
+  Datum ensureDatum() => $_ensure(1);
 
+  @$pb.TagNumber(3)
   $core.List<Term> get args => $_getList(2);
 
+  @$pb.TagNumber(4)
   $core.List<Term_AssocPair> get optargs => $_getList(3);
 }
diff --git a/lib/src/generated/ql2.pbenum.dart b/lib/src/generated/ql2.pbenum.dart
index 0ee1d4e..8b8a39b 100644
--- a/lib/src/generated/ql2.pbenum.dart
+++ b/lib/src/generated/ql2.pbenum.dart
@@ -2,24 +2,39 @@
 //  Generated code. Do not modify.
 //  source: ql2.proto
 //
-// @dart = 2.3
-// ignore_for_file: camel_case_types,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type
+// @dart = 2.12
+// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields
 
-// ignore_for_file: UNDEFINED_SHOWN_NAME,UNUSED_SHOWN_NAME
-import 'dart:core' as $core show int, dynamic, String, List, Map;
+// ignore_for_file: UNDEFINED_SHOWN_NAME
+import 'dart:core' as $core;
 import 'package:protobuf/protobuf.dart' as $pb;
 
 class VersionDummy_Version extends $pb.ProtobufEnum {
-  static const VersionDummy_Version V0_1 =
-      VersionDummy_Version._(1063369270, 'V0_1');
-  static const VersionDummy_Version V0_2 =
-      VersionDummy_Version._(1915781601, 'V0_2');
-  static const VersionDummy_Version V0_3 =
-      VersionDummy_Version._(1601562686, 'V0_3');
-  static const VersionDummy_Version V0_4 =
-      VersionDummy_Version._(1074539808, 'V0_4');
-  static const VersionDummy_Version V1_0 =
-      VersionDummy_Version._(885177795, 'V1_0');
+  static const VersionDummy_Version V0_1 = VersionDummy_Version._(
+      1063369270,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'V0_1');
+  static const VersionDummy_Version V0_2 = VersionDummy_Version._(
+      1915781601,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'V0_2');
+  static const VersionDummy_Version V0_3 = VersionDummy_Version._(
+      1601562686,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'V0_3');
+  static const VersionDummy_Version V0_4 = VersionDummy_Version._(
+      1074539808,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'V0_4');
+  static const VersionDummy_Version V1_0 = VersionDummy_Version._(
+      885177795,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'V1_0');
 
   static const $core.List<VersionDummy_Version> values = <VersionDummy_Version>[
     V0_1,
@@ -31,16 +46,22 @@ class VersionDummy_Version extends $pb.ProtobufEnum {
 
   static final $core.Map<$core.int, VersionDummy_Version> _byValue =
       $pb.ProtobufEnum.initByValue(values);
-  static VersionDummy_Version valueOf($core.int value) => _byValue[value];
+  static VersionDummy_Version? valueOf($core.int value) => _byValue[value];
 
   const VersionDummy_Version._($core.int v, $core.String n) : super(v, n);
 }
 
 class VersionDummy_Protocol extends $pb.ProtobufEnum {
-  static const VersionDummy_Protocol PROTOBUF =
-      VersionDummy_Protocol._(656407617, 'PROTOBUF');
-  static const VersionDummy_Protocol JSON =
-      VersionDummy_Protocol._(2120839367, 'JSON');
+  static const VersionDummy_Protocol PROTOBUF = VersionDummy_Protocol._(
+      656407617,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'PROTOBUF');
+  static const VersionDummy_Protocol JSON = VersionDummy_Protocol._(
+      2120839367,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'JSON');
 
   static const $core.List<VersionDummy_Protocol> values =
       <VersionDummy_Protocol>[
@@ -50,19 +71,37 @@ class VersionDummy_Protocol extends $pb.ProtobufEnum {
 
   static final $core.Map<$core.int, VersionDummy_Protocol> _byValue =
       $pb.ProtobufEnum.initByValue(values);
-  static VersionDummy_Protocol valueOf($core.int value) => _byValue[value];
+  static VersionDummy_Protocol? valueOf($core.int value) => _byValue[value];
 
   const VersionDummy_Protocol._($core.int v, $core.String n) : super(v, n);
 }
 
 class Query_QueryType extends $pb.ProtobufEnum {
-  static const Query_QueryType START = Query_QueryType._(1, 'START');
-  static const Query_QueryType CONTINUE = Query_QueryType._(2, 'CONTINUE');
-  static const Query_QueryType STOP = Query_QueryType._(3, 'STOP');
-  static const Query_QueryType NOREPLY_WAIT =
-      Query_QueryType._(4, 'NOREPLY_WAIT');
-  static const Query_QueryType SERVER_INFO =
-      Query_QueryType._(5, 'SERVER_INFO');
+  static const Query_QueryType START = Query_QueryType._(
+      1,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'START');
+  static const Query_QueryType CONTINUE = Query_QueryType._(
+      2,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'CONTINUE');
+  static const Query_QueryType STOP = Query_QueryType._(
+      3,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'STOP');
+  static const Query_QueryType NOREPLY_WAIT = Query_QueryType._(
+      4,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'NOREPLY_WAIT');
+  static const Query_QueryType SERVER_INFO = Query_QueryType._(
+      5,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'SERVER_INFO');
 
   static const $core.List<Query_QueryType> values = <Query_QueryType>[
     START,
@@ -74,14 +113,22 @@ class Query_QueryType extends $pb.ProtobufEnum {
 
   static final $core.Map<$core.int, Query_QueryType> _byValue =
       $pb.ProtobufEnum.initByValue(values);
-  static Query_QueryType valueOf($core.int value) => _byValue[value];
+  static Query_QueryType? valueOf($core.int value) => _byValue[value];
 
   const Query_QueryType._($core.int v, $core.String n) : super(v, n);
 }
 
 class Frame_FrameType extends $pb.ProtobufEnum {
-  static const Frame_FrameType POS = Frame_FrameType._(1, 'POS');
-  static const Frame_FrameType OPT = Frame_FrameType._(2, 'OPT');
+  static const Frame_FrameType POS = Frame_FrameType._(
+      1,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'POS');
+  static const Frame_FrameType OPT = Frame_FrameType._(
+      2,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'OPT');
 
   static const $core.List<Frame_FrameType> values = <Frame_FrameType>[
     POS,
@@ -90,28 +137,52 @@ class Frame_FrameType extends $pb.ProtobufEnum {
 
   static final $core.Map<$core.int, Frame_FrameType> _byValue =
       $pb.ProtobufEnum.initByValue(values);
-  static Frame_FrameType valueOf($core.int value) => _byValue[value];
+  static Frame_FrameType? valueOf($core.int value) => _byValue[value];
 
   const Frame_FrameType._($core.int v, $core.String n) : super(v, n);
 }
 
 class Response_ResponseType extends $pb.ProtobufEnum {
-  static const Response_ResponseType SUCCESS_ATOM =
-      Response_ResponseType._(1, 'SUCCESS_ATOM');
-  static const Response_ResponseType SUCCESS_SEQUENCE =
-      Response_ResponseType._(2, 'SUCCESS_SEQUENCE');
-  static const Response_ResponseType SUCCESS_PARTIAL =
-      Response_ResponseType._(3, 'SUCCESS_PARTIAL');
-  static const Response_ResponseType WAIT_COMPLETE =
-      Response_ResponseType._(4, 'WAIT_COMPLETE');
-  static const Response_ResponseType SERVER_INFO =
-      Response_ResponseType._(5, 'SERVER_INFO');
-  static const Response_ResponseType CLIENT_ERROR =
-      Response_ResponseType._(16, 'CLIENT_ERROR');
-  static const Response_ResponseType COMPILE_ERROR =
-      Response_ResponseType._(17, 'COMPILE_ERROR');
-  static const Response_ResponseType RUNTIME_ERROR =
-      Response_ResponseType._(18, 'RUNTIME_ERROR');
+  static const Response_ResponseType SUCCESS_ATOM = Response_ResponseType._(
+      1,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'SUCCESS_ATOM');
+  static const Response_ResponseType SUCCESS_SEQUENCE = Response_ResponseType._(
+      2,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'SUCCESS_SEQUENCE');
+  static const Response_ResponseType SUCCESS_PARTIAL = Response_ResponseType._(
+      3,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'SUCCESS_PARTIAL');
+  static const Response_ResponseType WAIT_COMPLETE = Response_ResponseType._(
+      4,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'WAIT_COMPLETE');
+  static const Response_ResponseType SERVER_INFO = Response_ResponseType._(
+      5,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'SERVER_INFO');
+  static const Response_ResponseType CLIENT_ERROR = Response_ResponseType._(
+      16,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'CLIENT_ERROR');
+  static const Response_ResponseType COMPILE_ERROR = Response_ResponseType._(
+      17,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'COMPILE_ERROR');
+  static const Response_ResponseType RUNTIME_ERROR = Response_ResponseType._(
+      18,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'RUNTIME_ERROR');
 
   static const $core.List<Response_ResponseType> values =
       <Response_ResponseType>[
@@ -127,27 +198,52 @@ class Response_ResponseType extends $pb.ProtobufEnum {
 
   static final $core.Map<$core.int, Response_ResponseType> _byValue =
       $pb.ProtobufEnum.initByValue(values);
-  static Response_ResponseType valueOf($core.int value) => _byValue[value];
+  static Response_ResponseType? valueOf($core.int value) => _byValue[value];
 
   const Response_ResponseType._($core.int v, $core.String n) : super(v, n);
 }
 
 class Response_ErrorType extends $pb.ProtobufEnum {
-  static const Response_ErrorType INTERNAL =
-      Response_ErrorType._(1000000, 'INTERNAL');
-  static const Response_ErrorType RESOURCE_LIMIT =
-      Response_ErrorType._(2000000, 'RESOURCE_LIMIT');
-  static const Response_ErrorType QUERY_LOGIC =
-      Response_ErrorType._(3000000, 'QUERY_LOGIC');
-  static const Response_ErrorType NON_EXISTENCE =
-      Response_ErrorType._(3100000, 'NON_EXISTENCE');
-  static const Response_ErrorType OP_FAILED =
-      Response_ErrorType._(4100000, 'OP_FAILED');
-  static const Response_ErrorType OP_INDETERMINATE =
-      Response_ErrorType._(4200000, 'OP_INDETERMINATE');
-  static const Response_ErrorType USER = Response_ErrorType._(5000000, 'USER');
-  static const Response_ErrorType PERMISSION_ERROR =
-      Response_ErrorType._(6000000, 'PERMISSION_ERROR');
+  static const Response_ErrorType INTERNAL = Response_ErrorType._(
+      1000000,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'INTERNAL');
+  static const Response_ErrorType RESOURCE_LIMIT = Response_ErrorType._(
+      2000000,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'RESOURCE_LIMIT');
+  static const Response_ErrorType QUERY_LOGIC = Response_ErrorType._(
+      3000000,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'QUERY_LOGIC');
+  static const Response_ErrorType NON_EXISTENCE = Response_ErrorType._(
+      3100000,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'NON_EXISTENCE');
+  static const Response_ErrorType OP_FAILED = Response_ErrorType._(
+      4100000,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'OP_FAILED');
+  static const Response_ErrorType OP_INDETERMINATE = Response_ErrorType._(
+      4200000,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'OP_INDETERMINATE');
+  static const Response_ErrorType USER = Response_ErrorType._(
+      5000000,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'USER');
+  static const Response_ErrorType PERMISSION_ERROR = Response_ErrorType._(
+      6000000,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'PERMISSION_ERROR');
 
   static const $core.List<Response_ErrorType> values = <Response_ErrorType>[
     INTERNAL,
@@ -162,22 +258,38 @@ class Response_ErrorType extends $pb.ProtobufEnum {
 
   static final $core.Map<$core.int, Response_ErrorType> _byValue =
       $pb.ProtobufEnum.initByValue(values);
-  static Response_ErrorType valueOf($core.int value) => _byValue[value];
+  static Response_ErrorType? valueOf($core.int value) => _byValue[value];
 
   const Response_ErrorType._($core.int v, $core.String n) : super(v, n);
 }
 
 class Response_ResponseNote extends $pb.ProtobufEnum {
-  static const Response_ResponseNote SEQUENCE_FEED =
-      Response_ResponseNote._(1, 'SEQUENCE_FEED');
-  static const Response_ResponseNote ATOM_FEED =
-      Response_ResponseNote._(2, 'ATOM_FEED');
+  static const Response_ResponseNote SEQUENCE_FEED = Response_ResponseNote._(
+      1,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'SEQUENCE_FEED');
+  static const Response_ResponseNote ATOM_FEED = Response_ResponseNote._(
+      2,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'ATOM_FEED');
   static const Response_ResponseNote ORDER_BY_LIMIT_FEED =
-      Response_ResponseNote._(3, 'ORDER_BY_LIMIT_FEED');
-  static const Response_ResponseNote UNIONED_FEED =
-      Response_ResponseNote._(4, 'UNIONED_FEED');
-  static const Response_ResponseNote INCLUDES_STATES =
-      Response_ResponseNote._(5, 'INCLUDES_STATES');
+      Response_ResponseNote._(
+          3,
+          const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+              ? ''
+              : 'ORDER_BY_LIMIT_FEED');
+  static const Response_ResponseNote UNIONED_FEED = Response_ResponseNote._(
+      4,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'UNIONED_FEED');
+  static const Response_ResponseNote INCLUDES_STATES = Response_ResponseNote._(
+      5,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'INCLUDES_STATES');
 
   static const $core.List<Response_ResponseNote> values =
       <Response_ResponseNote>[
@@ -190,19 +302,47 @@ class Response_ResponseNote extends $pb.ProtobufEnum {
 
   static final $core.Map<$core.int, Response_ResponseNote> _byValue =
       $pb.ProtobufEnum.initByValue(values);
-  static Response_ResponseNote valueOf($core.int value) => _byValue[value];
+  static Response_ResponseNote? valueOf($core.int value) => _byValue[value];
 
   const Response_ResponseNote._($core.int v, $core.String n) : super(v, n);
 }
 
 class Datum_DatumType extends $pb.ProtobufEnum {
-  static const Datum_DatumType R_NULL = Datum_DatumType._(1, 'R_NULL');
-  static const Datum_DatumType R_BOOL = Datum_DatumType._(2, 'R_BOOL');
-  static const Datum_DatumType R_NUM = Datum_DatumType._(3, 'R_NUM');
-  static const Datum_DatumType R_STR = Datum_DatumType._(4, 'R_STR');
-  static const Datum_DatumType R_ARRAY = Datum_DatumType._(5, 'R_ARRAY');
-  static const Datum_DatumType R_OBJECT = Datum_DatumType._(6, 'R_OBJECT');
-  static const Datum_DatumType R_JSON = Datum_DatumType._(7, 'R_JSON');
+  static const Datum_DatumType R_NULL = Datum_DatumType._(
+      1,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'R_NULL');
+  static const Datum_DatumType R_BOOL = Datum_DatumType._(
+      2,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'R_BOOL');
+  static const Datum_DatumType R_NUM = Datum_DatumType._(
+      3,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'R_NUM');
+  static const Datum_DatumType R_STR = Datum_DatumType._(
+      4,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'R_STR');
+  static const Datum_DatumType R_ARRAY = Datum_DatumType._(
+      5,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'R_ARRAY');
+  static const Datum_DatumType R_OBJECT = Datum_DatumType._(
+      6,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'R_OBJECT');
+  static const Datum_DatumType R_JSON = Datum_DatumType._(
+      7,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'R_JSON');
 
   static const $core.List<Datum_DatumType> values = <Datum_DatumType>[
     R_NULL,
@@ -216,208 +356,918 @@ class Datum_DatumType extends $pb.ProtobufEnum {
 
   static final $core.Map<$core.int, Datum_DatumType> _byValue =
       $pb.ProtobufEnum.initByValue(values);
-  static Datum_DatumType valueOf($core.int value) => _byValue[value];
+  static Datum_DatumType? valueOf($core.int value) => _byValue[value];
 
   const Datum_DatumType._($core.int v, $core.String n) : super(v, n);
 }
 
 class Term_TermType extends $pb.ProtobufEnum {
-  static const Term_TermType DATUM = Term_TermType._(1, 'DATUM');
-  static const Term_TermType MAKE_ARRAY = Term_TermType._(2, 'MAKE_ARRAY');
-  static const Term_TermType MAKE_OBJ = Term_TermType._(3, 'MAKE_OBJ');
-  static const Term_TermType VAR = Term_TermType._(10, 'VAR');
-  static const Term_TermType JAVASCRIPT = Term_TermType._(11, 'JAVASCRIPT');
-  static const Term_TermType UUID = Term_TermType._(169, 'UUID');
-  static const Term_TermType HTTP = Term_TermType._(153, 'HTTP');
-  static const Term_TermType ERROR = Term_TermType._(12, 'ERROR');
-  static const Term_TermType IMPLICIT_VAR = Term_TermType._(13, 'IMPLICIT_VAR');
-  static const Term_TermType DB = Term_TermType._(14, 'DB');
-  static const Term_TermType TABLE = Term_TermType._(15, 'TABLE');
-  static const Term_TermType GET = Term_TermType._(16, 'GET');
-  static const Term_TermType GET_ALL = Term_TermType._(78, 'GET_ALL');
-  static const Term_TermType EQ = Term_TermType._(17, 'EQ');
-  static const Term_TermType NE = Term_TermType._(18, 'NE');
-  static const Term_TermType LT = Term_TermType._(19, 'LT');
-  static const Term_TermType LE = Term_TermType._(20, 'LE');
-  static const Term_TermType GT = Term_TermType._(21, 'GT');
-  static const Term_TermType GE = Term_TermType._(22, 'GE');
-  static const Term_TermType NOT = Term_TermType._(23, 'NOT');
-  static const Term_TermType ADD = Term_TermType._(24, 'ADD');
-  static const Term_TermType SUB = Term_TermType._(25, 'SUB');
-  static const Term_TermType MUL = Term_TermType._(26, 'MUL');
-  static const Term_TermType DIV = Term_TermType._(27, 'DIV');
-  static const Term_TermType MOD = Term_TermType._(28, 'MOD');
-  static const Term_TermType FLOOR = Term_TermType._(183, 'FLOOR');
-  static const Term_TermType CEIL = Term_TermType._(184, 'CEIL');
-  static const Term_TermType ROUND = Term_TermType._(185, 'ROUND');
-  static const Term_TermType APPEND = Term_TermType._(29, 'APPEND');
-  static const Term_TermType PREPEND = Term_TermType._(80, 'PREPEND');
-  static const Term_TermType DIFFERENCE = Term_TermType._(95, 'DIFFERENCE');
-  static const Term_TermType SET_INSERT = Term_TermType._(88, 'SET_INSERT');
-  static const Term_TermType SET_INTERSECTION =
-      Term_TermType._(89, 'SET_INTERSECTION');
-  static const Term_TermType SET_UNION = Term_TermType._(90, 'SET_UNION');
-  static const Term_TermType SET_DIFFERENCE =
-      Term_TermType._(91, 'SET_DIFFERENCE');
-  static const Term_TermType SLICE = Term_TermType._(30, 'SLICE');
-  static const Term_TermType SKIP = Term_TermType._(70, 'SKIP');
-  static const Term_TermType LIMIT = Term_TermType._(71, 'LIMIT');
-  static const Term_TermType OFFSETS_OF = Term_TermType._(87, 'OFFSETS_OF');
-  static const Term_TermType CONTAINS = Term_TermType._(93, 'CONTAINS');
-  static const Term_TermType GET_FIELD = Term_TermType._(31, 'GET_FIELD');
-  static const Term_TermType KEYS = Term_TermType._(94, 'KEYS');
-  static const Term_TermType VALUES = Term_TermType._(186, 'VALUES');
-  static const Term_TermType OBJECT = Term_TermType._(143, 'OBJECT');
-  static const Term_TermType HAS_FIELDS = Term_TermType._(32, 'HAS_FIELDS');
-  static const Term_TermType WITH_FIELDS = Term_TermType._(96, 'WITH_FIELDS');
-  static const Term_TermType PLUCK = Term_TermType._(33, 'PLUCK');
-  static const Term_TermType WITHOUT = Term_TermType._(34, 'WITHOUT');
-  static const Term_TermType MERGE = Term_TermType._(35, 'MERGE');
-  static const Term_TermType BETWEEN_DEPRECATED =
-      Term_TermType._(36, 'BETWEEN_DEPRECATED');
-  static const Term_TermType BETWEEN = Term_TermType._(182, 'BETWEEN');
-  static const Term_TermType REDUCE = Term_TermType._(37, 'REDUCE');
-  static const Term_TermType MAP = Term_TermType._(38, 'MAP');
-  static const Term_TermType FOLD = Term_TermType._(187, 'FOLD');
-  static const Term_TermType FILTER = Term_TermType._(39, 'FILTER');
-  static const Term_TermType CONCAT_MAP = Term_TermType._(40, 'CONCAT_MAP');
-  static const Term_TermType ORDER_BY = Term_TermType._(41, 'ORDER_BY');
-  static const Term_TermType DISTINCT = Term_TermType._(42, 'DISTINCT');
-  static const Term_TermType COUNT = Term_TermType._(43, 'COUNT');
-  static const Term_TermType IS_EMPTY = Term_TermType._(86, 'IS_EMPTY');
-  static const Term_TermType UNION = Term_TermType._(44, 'UNION');
-  static const Term_TermType NTH = Term_TermType._(45, 'NTH');
-  static const Term_TermType BRACKET = Term_TermType._(170, 'BRACKET');
-  static const Term_TermType INNER_JOIN = Term_TermType._(48, 'INNER_JOIN');
-  static const Term_TermType OUTER_JOIN = Term_TermType._(49, 'OUTER_JOIN');
-  static const Term_TermType EQ_JOIN = Term_TermType._(50, 'EQ_JOIN');
-  static const Term_TermType ZIP = Term_TermType._(72, 'ZIP');
-  static const Term_TermType RANGE = Term_TermType._(173, 'RANGE');
-  static const Term_TermType INSERT_AT = Term_TermType._(82, 'INSERT_AT');
-  static const Term_TermType DELETE_AT = Term_TermType._(83, 'DELETE_AT');
-  static const Term_TermType CHANGE_AT = Term_TermType._(84, 'CHANGE_AT');
-  static const Term_TermType SPLICE_AT = Term_TermType._(85, 'SPLICE_AT');
-  static const Term_TermType COERCE_TO = Term_TermType._(51, 'COERCE_TO');
-  static const Term_TermType TYPE_OF = Term_TermType._(52, 'TYPE_OF');
-  static const Term_TermType UPDATE = Term_TermType._(53, 'UPDATE');
-  static const Term_TermType DELETE = Term_TermType._(54, 'DELETE');
-  static const Term_TermType REPLACE = Term_TermType._(55, 'REPLACE');
-  static const Term_TermType INSERT = Term_TermType._(56, 'INSERT');
-  static const Term_TermType DB_CREATE = Term_TermType._(57, 'DB_CREATE');
-  static const Term_TermType DB_DROP = Term_TermType._(58, 'DB_DROP');
-  static const Term_TermType DB_LIST = Term_TermType._(59, 'DB_LIST');
-  static const Term_TermType TABLE_CREATE = Term_TermType._(60, 'TABLE_CREATE');
-  static const Term_TermType TABLE_DROP = Term_TermType._(61, 'TABLE_DROP');
-  static const Term_TermType TABLE_LIST = Term_TermType._(62, 'TABLE_LIST');
-  static const Term_TermType CONFIG = Term_TermType._(174, 'CONFIG');
-  static const Term_TermType STATUS = Term_TermType._(175, 'STATUS');
-  static const Term_TermType WAIT = Term_TermType._(177, 'WAIT');
-  static const Term_TermType RECONFIGURE = Term_TermType._(176, 'RECONFIGURE');
-  static const Term_TermType REBALANCE = Term_TermType._(179, 'REBALANCE');
-  static const Term_TermType SYNC = Term_TermType._(138, 'SYNC');
-  static const Term_TermType GRANT = Term_TermType._(188, 'GRANT');
-  static const Term_TermType INDEX_CREATE = Term_TermType._(75, 'INDEX_CREATE');
-  static const Term_TermType INDEX_DROP = Term_TermType._(76, 'INDEX_DROP');
-  static const Term_TermType INDEX_LIST = Term_TermType._(77, 'INDEX_LIST');
-  static const Term_TermType INDEX_STATUS =
-      Term_TermType._(139, 'INDEX_STATUS');
-  static const Term_TermType INDEX_WAIT = Term_TermType._(140, 'INDEX_WAIT');
-  static const Term_TermType INDEX_RENAME =
-      Term_TermType._(156, 'INDEX_RENAME');
-  static const Term_TermType SET_WRITE_HOOK =
-      Term_TermType._(189, 'SET_WRITE_HOOK');
-  static const Term_TermType GET_WRITE_HOOK =
-      Term_TermType._(190, 'GET_WRITE_HOOK');
-  static const Term_TermType FUNCALL = Term_TermType._(64, 'FUNCALL');
-  static const Term_TermType BRANCH = Term_TermType._(65, 'BRANCH');
-  static const Term_TermType OR = Term_TermType._(66, 'OR');
-  static const Term_TermType AND = Term_TermType._(67, 'AND');
-  static const Term_TermType FOR_EACH = Term_TermType._(68, 'FOR_EACH');
-  static const Term_TermType FUNC = Term_TermType._(69, 'FUNC');
-  static const Term_TermType ASC = Term_TermType._(73, 'ASC');
-  static const Term_TermType DESC = Term_TermType._(74, 'DESC');
-  static const Term_TermType INFO = Term_TermType._(79, 'INFO');
-  static const Term_TermType MATCH = Term_TermType._(97, 'MATCH');
-  static const Term_TermType UPCASE = Term_TermType._(141, 'UPCASE');
-  static const Term_TermType DOWNCASE = Term_TermType._(142, 'DOWNCASE');
-  static const Term_TermType SAMPLE = Term_TermType._(81, 'SAMPLE');
-  static const Term_TermType DEFAULT = Term_TermType._(92, 'DEFAULT');
-  static const Term_TermType JSON = Term_TermType._(98, 'JSON');
-  static const Term_TermType ISO8601 = Term_TermType._(99, 'ISO8601');
-  static const Term_TermType TO_ISO8601 = Term_TermType._(100, 'TO_ISO8601');
-  static const Term_TermType EPOCH_TIME = Term_TermType._(101, 'EPOCH_TIME');
-  static const Term_TermType TO_EPOCH_TIME =
-      Term_TermType._(102, 'TO_EPOCH_TIME');
-  static const Term_TermType NOW = Term_TermType._(103, 'NOW');
-  static const Term_TermType IN_TIMEZONE = Term_TermType._(104, 'IN_TIMEZONE');
-  static const Term_TermType DURING = Term_TermType._(105, 'DURING');
-  static const Term_TermType DATE = Term_TermType._(106, 'DATE');
-  static const Term_TermType TIME_OF_DAY = Term_TermType._(126, 'TIME_OF_DAY');
-  static const Term_TermType TIMEZONE = Term_TermType._(127, 'TIMEZONE');
-  static const Term_TermType YEAR = Term_TermType._(128, 'YEAR');
-  static const Term_TermType MONTH = Term_TermType._(129, 'MONTH');
-  static const Term_TermType DAY = Term_TermType._(130, 'DAY');
-  static const Term_TermType DAY_OF_WEEK = Term_TermType._(131, 'DAY_OF_WEEK');
-  static const Term_TermType DAY_OF_YEAR = Term_TermType._(132, 'DAY_OF_YEAR');
-  static const Term_TermType HOURS = Term_TermType._(133, 'HOURS');
-  static const Term_TermType MINUTES = Term_TermType._(134, 'MINUTES');
-  static const Term_TermType SECONDS = Term_TermType._(135, 'SECONDS');
-  static const Term_TermType TIME = Term_TermType._(136, 'TIME');
-  static const Term_TermType MONDAY = Term_TermType._(107, 'MONDAY');
-  static const Term_TermType TUESDAY = Term_TermType._(108, 'TUESDAY');
-  static const Term_TermType WEDNESDAY = Term_TermType._(109, 'WEDNESDAY');
-  static const Term_TermType THURSDAY = Term_TermType._(110, 'THURSDAY');
-  static const Term_TermType FRIDAY = Term_TermType._(111, 'FRIDAY');
-  static const Term_TermType SATURDAY = Term_TermType._(112, 'SATURDAY');
-  static const Term_TermType SUNDAY = Term_TermType._(113, 'SUNDAY');
-  static const Term_TermType JANUARY = Term_TermType._(114, 'JANUARY');
-  static const Term_TermType FEBRUARY = Term_TermType._(115, 'FEBRUARY');
-  static const Term_TermType MARCH = Term_TermType._(116, 'MARCH');
-  static const Term_TermType APRIL = Term_TermType._(117, 'APRIL');
-  static const Term_TermType MAY = Term_TermType._(118, 'MAY');
-  static const Term_TermType JUNE = Term_TermType._(119, 'JUNE');
-  static const Term_TermType JULY = Term_TermType._(120, 'JULY');
-  static const Term_TermType AUGUST = Term_TermType._(121, 'AUGUST');
-  static const Term_TermType SEPTEMBER = Term_TermType._(122, 'SEPTEMBER');
-  static const Term_TermType OCTOBER = Term_TermType._(123, 'OCTOBER');
-  static const Term_TermType NOVEMBER = Term_TermType._(124, 'NOVEMBER');
-  static const Term_TermType DECEMBER = Term_TermType._(125, 'DECEMBER');
-  static const Term_TermType LITERAL = Term_TermType._(137, 'LITERAL');
-  static const Term_TermType GROUP = Term_TermType._(144, 'GROUP');
-  static const Term_TermType SUM = Term_TermType._(145, 'SUM');
-  static const Term_TermType AVG = Term_TermType._(146, 'AVG');
-  static const Term_TermType MIN = Term_TermType._(147, 'MIN');
-  static const Term_TermType MAX = Term_TermType._(148, 'MAX');
-  static const Term_TermType SPLIT = Term_TermType._(149, 'SPLIT');
-  static const Term_TermType UNGROUP = Term_TermType._(150, 'UNGROUP');
-  static const Term_TermType RANDOM = Term_TermType._(151, 'RANDOM');
-  static const Term_TermType CHANGES = Term_TermType._(152, 'CHANGES');
-  static const Term_TermType ARGS = Term_TermType._(154, 'ARGS');
-  static const Term_TermType BINARY = Term_TermType._(155, 'BINARY');
-  static const Term_TermType GEOJSON = Term_TermType._(157, 'GEOJSON');
-  static const Term_TermType TO_GEOJSON = Term_TermType._(158, 'TO_GEOJSON');
-  static const Term_TermType POINT = Term_TermType._(159, 'POINT');
-  static const Term_TermType LINE = Term_TermType._(160, 'LINE');
-  static const Term_TermType POLYGON = Term_TermType._(161, 'POLYGON');
-  static const Term_TermType DISTANCE = Term_TermType._(162, 'DISTANCE');
-  static const Term_TermType INTERSECTS = Term_TermType._(163, 'INTERSECTS');
-  static const Term_TermType INCLUDES = Term_TermType._(164, 'INCLUDES');
-  static const Term_TermType CIRCLE = Term_TermType._(165, 'CIRCLE');
-  static const Term_TermType GET_INTERSECTING =
-      Term_TermType._(166, 'GET_INTERSECTING');
-  static const Term_TermType FILL = Term_TermType._(167, 'FILL');
-  static const Term_TermType GET_NEAREST = Term_TermType._(168, 'GET_NEAREST');
-  static const Term_TermType POLYGON_SUB = Term_TermType._(171, 'POLYGON_SUB');
-  static const Term_TermType TO_JSON_STRING =
-      Term_TermType._(172, 'TO_JSON_STRING');
-  static const Term_TermType MINVAL = Term_TermType._(180, 'MINVAL');
-  static const Term_TermType MAXVAL = Term_TermType._(181, 'MAXVAL');
-  static const Term_TermType BIT_AND = Term_TermType._(191, 'BIT_AND');
-  static const Term_TermType BIT_OR = Term_TermType._(192, 'BIT_OR');
-  static const Term_TermType BIT_XOR = Term_TermType._(193, 'BIT_XOR');
-  static const Term_TermType BIT_NOT = Term_TermType._(194, 'BIT_NOT');
-  static const Term_TermType BIT_SAL = Term_TermType._(195, 'BIT_SAL');
-  static const Term_TermType BIT_SAR = Term_TermType._(196, 'BIT_SAR');
+  static const Term_TermType DATUM = Term_TermType._(
+      1,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'DATUM');
+  static const Term_TermType MAKE_ARRAY = Term_TermType._(
+      2,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'MAKE_ARRAY');
+  static const Term_TermType MAKE_OBJ = Term_TermType._(
+      3,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'MAKE_OBJ');
+  static const Term_TermType VAR = Term_TermType._(
+      10,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'VAR');
+  static const Term_TermType JAVASCRIPT = Term_TermType._(
+      11,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'JAVASCRIPT');
+  static const Term_TermType UUID = Term_TermType._(
+      169,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'UUID');
+  static const Term_TermType HTTP = Term_TermType._(
+      153,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'HTTP');
+  static const Term_TermType ERROR = Term_TermType._(
+      12,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'ERROR');
+  static const Term_TermType IMPLICIT_VAR = Term_TermType._(
+      13,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'IMPLICIT_VAR');
+  static const Term_TermType DB = Term_TermType._(14,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'DB');
+  static const Term_TermType TABLE = Term_TermType._(
+      15,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'TABLE');
+  static const Term_TermType GET = Term_TermType._(
+      16,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'GET');
+  static const Term_TermType GET_ALL = Term_TermType._(
+      78,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'GET_ALL');
+  static const Term_TermType EQ = Term_TermType._(17,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'EQ');
+  static const Term_TermType NE = Term_TermType._(18,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'NE');
+  static const Term_TermType LT = Term_TermType._(19,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'LT');
+  static const Term_TermType LE = Term_TermType._(20,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'LE');
+  static const Term_TermType GT = Term_TermType._(21,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'GT');
+  static const Term_TermType GE = Term_TermType._(22,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'GE');
+  static const Term_TermType NOT = Term_TermType._(
+      23,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'NOT');
+  static const Term_TermType ADD = Term_TermType._(
+      24,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'ADD');
+  static const Term_TermType SUB = Term_TermType._(
+      25,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'SUB');
+  static const Term_TermType MUL = Term_TermType._(
+      26,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'MUL');
+  static const Term_TermType DIV = Term_TermType._(
+      27,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'DIV');
+  static const Term_TermType MOD = Term_TermType._(
+      28,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'MOD');
+  static const Term_TermType FLOOR = Term_TermType._(
+      183,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'FLOOR');
+  static const Term_TermType CEIL = Term_TermType._(
+      184,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'CEIL');
+  static const Term_TermType ROUND = Term_TermType._(
+      185,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'ROUND');
+  static const Term_TermType APPEND = Term_TermType._(
+      29,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'APPEND');
+  static const Term_TermType PREPEND = Term_TermType._(
+      80,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'PREPEND');
+  static const Term_TermType DIFFERENCE = Term_TermType._(
+      95,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'DIFFERENCE');
+  static const Term_TermType SET_INSERT = Term_TermType._(
+      88,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'SET_INSERT');
+  static const Term_TermType SET_INTERSECTION = Term_TermType._(
+      89,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'SET_INTERSECTION');
+  static const Term_TermType SET_UNION = Term_TermType._(
+      90,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'SET_UNION');
+  static const Term_TermType SET_DIFFERENCE = Term_TermType._(
+      91,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'SET_DIFFERENCE');
+  static const Term_TermType SLICE = Term_TermType._(
+      30,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'SLICE');
+  static const Term_TermType SKIP = Term_TermType._(
+      70,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'SKIP');
+  static const Term_TermType LIMIT = Term_TermType._(
+      71,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'LIMIT');
+  static const Term_TermType OFFSETS_OF = Term_TermType._(
+      87,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'OFFSETS_OF');
+  static const Term_TermType CONTAINS = Term_TermType._(
+      93,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'CONTAINS');
+  static const Term_TermType GET_FIELD = Term_TermType._(
+      31,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'GET_FIELD');
+  static const Term_TermType KEYS = Term_TermType._(
+      94,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'KEYS');
+  static const Term_TermType VALUES = Term_TermType._(
+      186,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'VALUES');
+  static const Term_TermType OBJECT = Term_TermType._(
+      143,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'OBJECT');
+  static const Term_TermType HAS_FIELDS = Term_TermType._(
+      32,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'HAS_FIELDS');
+  static const Term_TermType WITH_FIELDS = Term_TermType._(
+      96,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'WITH_FIELDS');
+  static const Term_TermType PLUCK = Term_TermType._(
+      33,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'PLUCK');
+  static const Term_TermType WITHOUT = Term_TermType._(
+      34,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'WITHOUT');
+  static const Term_TermType MERGE = Term_TermType._(
+      35,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'MERGE');
+  static const Term_TermType BETWEEN_DEPRECATED = Term_TermType._(
+      36,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'BETWEEN_DEPRECATED');
+  static const Term_TermType BETWEEN = Term_TermType._(
+      182,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'BETWEEN');
+  static const Term_TermType REDUCE = Term_TermType._(
+      37,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'REDUCE');
+  static const Term_TermType MAP = Term_TermType._(
+      38,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'MAP');
+  static const Term_TermType FOLD = Term_TermType._(
+      187,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'FOLD');
+  static const Term_TermType FILTER = Term_TermType._(
+      39,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'FILTER');
+  static const Term_TermType CONCAT_MAP = Term_TermType._(
+      40,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'CONCAT_MAP');
+  static const Term_TermType ORDER_BY = Term_TermType._(
+      41,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'ORDER_BY');
+  static const Term_TermType DISTINCT = Term_TermType._(
+      42,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'DISTINCT');
+  static const Term_TermType COUNT = Term_TermType._(
+      43,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'COUNT');
+  static const Term_TermType IS_EMPTY = Term_TermType._(
+      86,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'IS_EMPTY');
+  static const Term_TermType UNION = Term_TermType._(
+      44,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'UNION');
+  static const Term_TermType NTH = Term_TermType._(
+      45,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'NTH');
+  static const Term_TermType BRACKET = Term_TermType._(
+      170,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'BRACKET');
+  static const Term_TermType INNER_JOIN = Term_TermType._(
+      48,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'INNER_JOIN');
+  static const Term_TermType OUTER_JOIN = Term_TermType._(
+      49,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'OUTER_JOIN');
+  static const Term_TermType EQ_JOIN = Term_TermType._(
+      50,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'EQ_JOIN');
+  static const Term_TermType ZIP = Term_TermType._(
+      72,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'ZIP');
+  static const Term_TermType RANGE = Term_TermType._(
+      173,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'RANGE');
+  static const Term_TermType INSERT_AT = Term_TermType._(
+      82,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'INSERT_AT');
+  static const Term_TermType DELETE_AT = Term_TermType._(
+      83,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'DELETE_AT');
+  static const Term_TermType CHANGE_AT = Term_TermType._(
+      84,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'CHANGE_AT');
+  static const Term_TermType SPLICE_AT = Term_TermType._(
+      85,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'SPLICE_AT');
+  static const Term_TermType COERCE_TO = Term_TermType._(
+      51,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'COERCE_TO');
+  static const Term_TermType TYPE_OF = Term_TermType._(
+      52,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'TYPE_OF');
+  static const Term_TermType UPDATE = Term_TermType._(
+      53,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'UPDATE');
+  static const Term_TermType DELETE = Term_TermType._(
+      54,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'DELETE');
+  static const Term_TermType REPLACE = Term_TermType._(
+      55,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'REPLACE');
+  static const Term_TermType INSERT = Term_TermType._(
+      56,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'INSERT');
+  static const Term_TermType DB_CREATE = Term_TermType._(
+      57,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'DB_CREATE');
+  static const Term_TermType DB_DROP = Term_TermType._(
+      58,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'DB_DROP');
+  static const Term_TermType DB_LIST = Term_TermType._(
+      59,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'DB_LIST');
+  static const Term_TermType TABLE_CREATE = Term_TermType._(
+      60,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'TABLE_CREATE');
+  static const Term_TermType TABLE_DROP = Term_TermType._(
+      61,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'TABLE_DROP');
+  static const Term_TermType TABLE_LIST = Term_TermType._(
+      62,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'TABLE_LIST');
+  static const Term_TermType CONFIG = Term_TermType._(
+      174,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'CONFIG');
+  static const Term_TermType STATUS = Term_TermType._(
+      175,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'STATUS');
+  static const Term_TermType WAIT = Term_TermType._(
+      177,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'WAIT');
+  static const Term_TermType RECONFIGURE = Term_TermType._(
+      176,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'RECONFIGURE');
+  static const Term_TermType REBALANCE = Term_TermType._(
+      179,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'REBALANCE');
+  static const Term_TermType SYNC = Term_TermType._(
+      138,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'SYNC');
+  static const Term_TermType GRANT = Term_TermType._(
+      188,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'GRANT');
+  static const Term_TermType INDEX_CREATE = Term_TermType._(
+      75,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'INDEX_CREATE');
+  static const Term_TermType INDEX_DROP = Term_TermType._(
+      76,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'INDEX_DROP');
+  static const Term_TermType INDEX_LIST = Term_TermType._(
+      77,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'INDEX_LIST');
+  static const Term_TermType INDEX_STATUS = Term_TermType._(
+      139,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'INDEX_STATUS');
+  static const Term_TermType INDEX_WAIT = Term_TermType._(
+      140,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'INDEX_WAIT');
+  static const Term_TermType INDEX_RENAME = Term_TermType._(
+      156,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'INDEX_RENAME');
+  static const Term_TermType SET_WRITE_HOOK = Term_TermType._(
+      189,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'SET_WRITE_HOOK');
+  static const Term_TermType GET_WRITE_HOOK = Term_TermType._(
+      190,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'GET_WRITE_HOOK');
+  static const Term_TermType FUNCALL = Term_TermType._(
+      64,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'FUNCALL');
+  static const Term_TermType BRANCH = Term_TermType._(
+      65,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'BRANCH');
+  static const Term_TermType OR = Term_TermType._(66,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'OR');
+  static const Term_TermType AND = Term_TermType._(
+      67,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'AND');
+  static const Term_TermType FOR_EACH = Term_TermType._(
+      68,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'FOR_EACH');
+  static const Term_TermType FUNC = Term_TermType._(
+      69,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'FUNC');
+  static const Term_TermType ASC = Term_TermType._(
+      73,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'ASC');
+  static const Term_TermType DESC = Term_TermType._(
+      74,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'DESC');
+  static const Term_TermType INFO = Term_TermType._(
+      79,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'INFO');
+  static const Term_TermType MATCH = Term_TermType._(
+      97,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'MATCH');
+  static const Term_TermType UPCASE = Term_TermType._(
+      141,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'UPCASE');
+  static const Term_TermType DOWNCASE = Term_TermType._(
+      142,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'DOWNCASE');
+  static const Term_TermType SAMPLE = Term_TermType._(
+      81,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'SAMPLE');
+  static const Term_TermType DEFAULT = Term_TermType._(
+      92,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'DEFAULT');
+  static const Term_TermType JSON = Term_TermType._(
+      98,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'JSON');
+  static const Term_TermType ISO8601 = Term_TermType._(
+      99,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'ISO8601');
+  static const Term_TermType TO_ISO8601 = Term_TermType._(
+      100,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'TO_ISO8601');
+  static const Term_TermType EPOCH_TIME = Term_TermType._(
+      101,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'EPOCH_TIME');
+  static const Term_TermType TO_EPOCH_TIME = Term_TermType._(
+      102,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'TO_EPOCH_TIME');
+  static const Term_TermType NOW = Term_TermType._(
+      103,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'NOW');
+  static const Term_TermType IN_TIMEZONE = Term_TermType._(
+      104,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'IN_TIMEZONE');
+  static const Term_TermType DURING = Term_TermType._(
+      105,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'DURING');
+  static const Term_TermType DATE = Term_TermType._(
+      106,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'DATE');
+  static const Term_TermType TIME_OF_DAY = Term_TermType._(
+      126,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'TIME_OF_DAY');
+  static const Term_TermType TIMEZONE = Term_TermType._(
+      127,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'TIMEZONE');
+  static const Term_TermType YEAR = Term_TermType._(
+      128,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'YEAR');
+  static const Term_TermType MONTH = Term_TermType._(
+      129,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'MONTH');
+  static const Term_TermType DAY = Term_TermType._(
+      130,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'DAY');
+  static const Term_TermType DAY_OF_WEEK = Term_TermType._(
+      131,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'DAY_OF_WEEK');
+  static const Term_TermType DAY_OF_YEAR = Term_TermType._(
+      132,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'DAY_OF_YEAR');
+  static const Term_TermType HOURS = Term_TermType._(
+      133,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'HOURS');
+  static const Term_TermType MINUTES = Term_TermType._(
+      134,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'MINUTES');
+  static const Term_TermType SECONDS = Term_TermType._(
+      135,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'SECONDS');
+  static const Term_TermType TIME = Term_TermType._(
+      136,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'TIME');
+  static const Term_TermType MONDAY = Term_TermType._(
+      107,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'MONDAY');
+  static const Term_TermType TUESDAY = Term_TermType._(
+      108,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'TUESDAY');
+  static const Term_TermType WEDNESDAY = Term_TermType._(
+      109,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'WEDNESDAY');
+  static const Term_TermType THURSDAY = Term_TermType._(
+      110,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'THURSDAY');
+  static const Term_TermType FRIDAY = Term_TermType._(
+      111,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'FRIDAY');
+  static const Term_TermType SATURDAY = Term_TermType._(
+      112,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'SATURDAY');
+  static const Term_TermType SUNDAY = Term_TermType._(
+      113,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'SUNDAY');
+  static const Term_TermType JANUARY = Term_TermType._(
+      114,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'JANUARY');
+  static const Term_TermType FEBRUARY = Term_TermType._(
+      115,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'FEBRUARY');
+  static const Term_TermType MARCH = Term_TermType._(
+      116,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'MARCH');
+  static const Term_TermType APRIL = Term_TermType._(
+      117,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'APRIL');
+  static const Term_TermType MAY = Term_TermType._(
+      118,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'MAY');
+  static const Term_TermType JUNE = Term_TermType._(
+      119,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'JUNE');
+  static const Term_TermType JULY = Term_TermType._(
+      120,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'JULY');
+  static const Term_TermType AUGUST = Term_TermType._(
+      121,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'AUGUST');
+  static const Term_TermType SEPTEMBER = Term_TermType._(
+      122,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'SEPTEMBER');
+  static const Term_TermType OCTOBER = Term_TermType._(
+      123,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'OCTOBER');
+  static const Term_TermType NOVEMBER = Term_TermType._(
+      124,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'NOVEMBER');
+  static const Term_TermType DECEMBER = Term_TermType._(
+      125,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'DECEMBER');
+  static const Term_TermType LITERAL = Term_TermType._(
+      137,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'LITERAL');
+  static const Term_TermType GROUP = Term_TermType._(
+      144,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'GROUP');
+  static const Term_TermType SUM = Term_TermType._(
+      145,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'SUM');
+  static const Term_TermType AVG = Term_TermType._(
+      146,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'AVG');
+  static const Term_TermType MIN = Term_TermType._(
+      147,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'MIN');
+  static const Term_TermType MAX = Term_TermType._(
+      148,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'MAX');
+  static const Term_TermType SPLIT = Term_TermType._(
+      149,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'SPLIT');
+  static const Term_TermType UNGROUP = Term_TermType._(
+      150,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'UNGROUP');
+  static const Term_TermType RANDOM = Term_TermType._(
+      151,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'RANDOM');
+  static const Term_TermType CHANGES = Term_TermType._(
+      152,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'CHANGES');
+  static const Term_TermType ARGS = Term_TermType._(
+      154,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'ARGS');
+  static const Term_TermType BINARY = Term_TermType._(
+      155,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'BINARY');
+  static const Term_TermType GEOJSON = Term_TermType._(
+      157,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'GEOJSON');
+  static const Term_TermType TO_GEOJSON = Term_TermType._(
+      158,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'TO_GEOJSON');
+  static const Term_TermType POINT = Term_TermType._(
+      159,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'POINT');
+  static const Term_TermType LINE = Term_TermType._(
+      160,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'LINE');
+  static const Term_TermType POLYGON = Term_TermType._(
+      161,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'POLYGON');
+  static const Term_TermType DISTANCE = Term_TermType._(
+      162,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'DISTANCE');
+  static const Term_TermType INTERSECTS = Term_TermType._(
+      163,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'INTERSECTS');
+  static const Term_TermType INCLUDES = Term_TermType._(
+      164,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'INCLUDES');
+  static const Term_TermType CIRCLE = Term_TermType._(
+      165,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'CIRCLE');
+  static const Term_TermType GET_INTERSECTING = Term_TermType._(
+      166,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'GET_INTERSECTING');
+  static const Term_TermType FILL = Term_TermType._(
+      167,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'FILL');
+  static const Term_TermType GET_NEAREST = Term_TermType._(
+      168,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'GET_NEAREST');
+  static const Term_TermType POLYGON_SUB = Term_TermType._(
+      171,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'POLYGON_SUB');
+  static const Term_TermType TO_JSON_STRING = Term_TermType._(
+      172,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'TO_JSON_STRING');
+  static const Term_TermType MINVAL = Term_TermType._(
+      180,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'MINVAL');
+  static const Term_TermType MAXVAL = Term_TermType._(
+      181,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'MAXVAL');
+  static const Term_TermType BIT_AND = Term_TermType._(
+      191,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'BIT_AND');
+  static const Term_TermType BIT_OR = Term_TermType._(
+      192,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'BIT_OR');
+  static const Term_TermType BIT_XOR = Term_TermType._(
+      193,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'BIT_XOR');
+  static const Term_TermType BIT_NOT = Term_TermType._(
+      194,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'BIT_NOT');
+  static const Term_TermType BIT_SAL = Term_TermType._(
+      195,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'BIT_SAL');
+  static const Term_TermType BIT_SAR = Term_TermType._(
+      196,
+      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
+          ? ''
+          : 'BIT_SAR');
 
   static const $core.List<Term_TermType> values = <Term_TermType>[
     DATUM,
@@ -610,7 +1460,7 @@ class Term_TermType extends $pb.ProtobufEnum {
 
   static final $core.Map<$core.int, Term_TermType> _byValue =
       $pb.ProtobufEnum.initByValue(values);
-  static Term_TermType valueOf($core.int value) => _byValue[value];
+  static Term_TermType? valueOf($core.int value) => _byValue[value];
 
   const Term_TermType._($core.int v, $core.String n) : super(v, n);
 }
diff --git a/lib/src/generated/ql2.pbjson.dart b/lib/src/generated/ql2.pbjson.dart
index 5173128..75575b5 100644
--- a/lib/src/generated/ql2.pbjson.dart
+++ b/lib/src/generated/ql2.pbjson.dart
@@ -2,37 +2,48 @@
 //  Generated code. Do not modify.
 //  source: ql2.proto
 //
-// @dart = 2.3
-// ignore_for_file: camel_case_types,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type
+// @dart = 2.12
+// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields,deprecated_member_use_from_same_package
 
-const VersionDummy$json = {
+import 'dart:core' as $core;
+import 'dart:convert' as $convert;
+import 'dart:typed_data' as $typed_data;
+
+@$core.Deprecated('Use versionDummyDescriptor instead')
+const VersionDummy$json = const {
   '1': 'VersionDummy',
-  '4': [VersionDummy_Version$json, VersionDummy_Protocol$json],
+  '4': const [VersionDummy_Version$json, VersionDummy_Protocol$json],
 };
 
-const VersionDummy_Version$json = {
+@$core.Deprecated('Use versionDummyDescriptor instead')
+const VersionDummy_Version$json = const {
   '1': 'Version',
-  '2': [
-    {'1': 'V0_1', '2': 1063369270},
-    {'1': 'V0_2', '2': 1915781601},
-    {'1': 'V0_3', '2': 1601562686},
-    {'1': 'V0_4', '2': 1074539808},
-    {'1': 'V1_0', '2': 885177795},
+  '2': const [
+    const {'1': 'V0_1', '2': 1063369270},
+    const {'1': 'V0_2', '2': 1915781601},
+    const {'1': 'V0_3', '2': 1601562686},
+    const {'1': 'V0_4', '2': 1074539808},
+    const {'1': 'V1_0', '2': 885177795},
   ],
 };
 
-const VersionDummy_Protocol$json = {
+@$core.Deprecated('Use versionDummyDescriptor instead')
+const VersionDummy_Protocol$json = const {
   '1': 'Protocol',
-  '2': [
-    {'1': 'PROTOBUF', '2': 656407617},
-    {'1': 'JSON', '2': 2120839367},
+  '2': const [
+    const {'1': 'PROTOBUF', '2': 656407617},
+    const {'1': 'JSON', '2': 2120839367},
   ],
 };
 
-const Query$json = {
+/// Descriptor for `VersionDummy`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List versionDummyDescriptor = $convert.base64Decode(
+    'CgxWZXJzaW9uRHVtbXkiTwoHVmVyc2lvbhIMCgRWMF8xELb0hvsDEgwKBFYwXzIQ4YPCkQcSDAoEVjBfMxC+0Nf7BRIMCgRWMF80EKDasIAEEgwKBFYxXzAQw/uKpgMiKgoIUHJvdG9jb2wSEAoIUFJPVE9CVUYQwfj/uAISDAoESlNPThDH4aXzBw==');
+@$core.Deprecated('Use queryDescriptor instead')
+const Query$json = const {
   '1': 'Query',
-  '2': [
-    {
+  '2': const [
+    const {
       '1': 'type',
       '3': 1,
       '4': 1,
@@ -40,9 +51,9 @@ const Query$json = {
       '6': '.Query.QueryType',
       '10': 'type'
     },
-    {'1': 'query', '3': 2, '4': 1, '5': 11, '6': '.Term', '10': 'query'},
-    {'1': 'token', '3': 3, '4': 1, '5': 3, '10': 'token'},
-    {
+    const {'1': 'query', '3': 2, '4': 1, '5': 11, '6': '.Term', '10': 'query'},
+    const {'1': 'token', '3': 3, '4': 1, '5': 3, '10': 'token'},
+    const {
       '1': 'OBSOLETE_noreply',
       '3': 4,
       '4': 1,
@@ -50,7 +61,7 @@ const Query$json = {
       '7': 'false',
       '10': 'OBSOLETENoreply'
     },
-    {
+    const {
       '1': 'accepts_r_json',
       '3': 5,
       '4': 1,
@@ -58,7 +69,7 @@ const Query$json = {
       '7': 'false',
       '10': 'acceptsRJson'
     },
-    {
+    const {
       '1': 'global_optargs',
       '3': 6,
       '4': 3,
@@ -67,33 +78,39 @@ const Query$json = {
       '10': 'globalOptargs'
     },
   ],
-  '3': [Query_AssocPair$json],
-  '4': [Query_QueryType$json],
+  '3': const [Query_AssocPair$json],
+  '4': const [Query_QueryType$json],
 };
 
-const Query_AssocPair$json = {
+@$core.Deprecated('Use queryDescriptor instead')
+const Query_AssocPair$json = const {
   '1': 'AssocPair',
-  '2': [
-    {'1': 'key', '3': 1, '4': 1, '5': 9, '10': 'key'},
-    {'1': 'val', '3': 2, '4': 1, '5': 11, '6': '.Term', '10': 'val'},
+  '2': const [
+    const {'1': 'key', '3': 1, '4': 1, '5': 9, '10': 'key'},
+    const {'1': 'val', '3': 2, '4': 1, '5': 11, '6': '.Term', '10': 'val'},
   ],
 };
 
-const Query_QueryType$json = {
+@$core.Deprecated('Use queryDescriptor instead')
+const Query_QueryType$json = const {
   '1': 'QueryType',
-  '2': [
-    {'1': 'START', '2': 1},
-    {'1': 'CONTINUE', '2': 2},
-    {'1': 'STOP', '2': 3},
-    {'1': 'NOREPLY_WAIT', '2': 4},
-    {'1': 'SERVER_INFO', '2': 5},
+  '2': const [
+    const {'1': 'START', '2': 1},
+    const {'1': 'CONTINUE', '2': 2},
+    const {'1': 'STOP', '2': 3},
+    const {'1': 'NOREPLY_WAIT', '2': 4},
+    const {'1': 'SERVER_INFO', '2': 5},
   ],
 };
 
-const Frame$json = {
+/// Descriptor for `Query`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List queryDescriptor = $convert.base64Decode(
+    'CgVRdWVyeRIkCgR0eXBlGAEgASgOMhAuUXVlcnkuUXVlcnlUeXBlUgR0eXBlEhsKBXF1ZXJ5GAIgASgLMgUuVGVybVIFcXVlcnkSFAoFdG9rZW4YAyABKANSBXRva2VuEjAKEE9CU09MRVRFX25vcmVwbHkYBCABKAg6BWZhbHNlUg9PQlNPTEVURU5vcmVwbHkSKwoOYWNjZXB0c19yX2pzb24YBSABKAg6BWZhbHNlUgxhY2NlcHRzUkpzb24SNwoOZ2xvYmFsX29wdGFyZ3MYBiADKAsyEC5RdWVyeS5Bc3NvY1BhaXJSDWdsb2JhbE9wdGFyZ3MaNgoJQXNzb2NQYWlyEhAKA2tleRgBIAEoCVIDa2V5EhcKA3ZhbBgCIAEoCzIFLlRlcm1SA3ZhbCJRCglRdWVyeVR5cGUSCQoFU1RBUlQQARIMCghDT05USU5VRRACEggKBFNUT1AQAxIQCgxOT1JFUExZX1dBSVQQBBIPCgtTRVJWRVJfSU5GTxAF');
+@$core.Deprecated('Use frameDescriptor instead')
+const Frame$json = const {
   '1': 'Frame',
-  '2': [
-    {
+  '2': const [
+    const {
       '1': 'type',
       '3': 1,
       '4': 1,
@@ -101,31 +118,47 @@ const Frame$json = {
       '6': '.Frame.FrameType',
       '10': 'type'
     },
-    {'1': 'pos', '3': 2, '4': 1, '5': 3, '10': 'pos'},
-    {'1': 'opt', '3': 3, '4': 1, '5': 9, '10': 'opt'},
+    const {'1': 'pos', '3': 2, '4': 1, '5': 3, '10': 'pos'},
+    const {'1': 'opt', '3': 3, '4': 1, '5': 9, '10': 'opt'},
   ],
-  '4': [Frame_FrameType$json],
+  '4': const [Frame_FrameType$json],
 };
 
-const Frame_FrameType$json = {
+@$core.Deprecated('Use frameDescriptor instead')
+const Frame_FrameType$json = const {
   '1': 'FrameType',
-  '2': [
-    {'1': 'POS', '2': 1},
-    {'1': 'OPT', '2': 2},
+  '2': const [
+    const {'1': 'POS', '2': 1},
+    const {'1': 'OPT', '2': 2},
   ],
 };
 
-const Backtrace$json = {
+/// Descriptor for `Frame`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List frameDescriptor = $convert.base64Decode(
+    'CgVGcmFtZRIkCgR0eXBlGAEgASgOMhAuRnJhbWUuRnJhbWVUeXBlUgR0eXBlEhAKA3BvcxgCIAEoA1IDcG9zEhAKA29wdBgDIAEoCVIDb3B0Ih0KCUZyYW1lVHlwZRIHCgNQT1MQARIHCgNPUFQQAg==');
+@$core.Deprecated('Use backtraceDescriptor instead')
+const Backtrace$json = const {
   '1': 'Backtrace',
-  '2': [
-    {'1': 'frames', '3': 1, '4': 3, '5': 11, '6': '.Frame', '10': 'frames'},
+  '2': const [
+    const {
+      '1': 'frames',
+      '3': 1,
+      '4': 3,
+      '5': 11,
+      '6': '.Frame',
+      '10': 'frames'
+    },
   ],
 };
 
-const Response$json = {
+/// Descriptor for `Backtrace`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List backtraceDescriptor = $convert.base64Decode(
+    'CglCYWNrdHJhY2USHgoGZnJhbWVzGAEgAygLMgYuRnJhbWVSBmZyYW1lcw==');
+@$core.Deprecated('Use responseDescriptor instead')
+const Response$json = const {
   '1': 'Response',
-  '2': [
-    {
+  '2': const [
+    const {
       '1': 'type',
       '3': 1,
       '4': 1,
@@ -133,7 +166,7 @@ const Response$json = {
       '6': '.Response.ResponseType',
       '10': 'type'
     },
-    {
+    const {
       '1': 'error_type',
       '3': 7,
       '4': 1,
@@ -141,7 +174,7 @@ const Response$json = {
       '6': '.Response.ErrorType',
       '10': 'errorType'
     },
-    {
+    const {
       '1': 'notes',
       '3': 6,
       '4': 3,
@@ -149,9 +182,16 @@ const Response$json = {
       '6': '.Response.ResponseNote',
       '10': 'notes'
     },
-    {'1': 'token', '3': 2, '4': 1, '5': 3, '10': 'token'},
-    {'1': 'response', '3': 3, '4': 3, '5': 11, '6': '.Datum', '10': 'response'},
-    {
+    const {'1': 'token', '3': 2, '4': 1, '5': 3, '10': 'token'},
+    const {
+      '1': 'response',
+      '3': 3,
+      '4': 3,
+      '5': 11,
+      '6': '.Datum',
+      '10': 'response'
+    },
+    const {
       '1': 'backtrace',
       '3': 4,
       '4': 1,
@@ -159,58 +199,72 @@ const Response$json = {
       '6': '.Backtrace',
       '10': 'backtrace'
     },
-    {'1': 'profile', '3': 5, '4': 1, '5': 11, '6': '.Datum', '10': 'profile'},
+    const {
+      '1': 'profile',
+      '3': 5,
+      '4': 1,
+      '5': 11,
+      '6': '.Datum',
+      '10': 'profile'
+    },
   ],
-  '4': [
+  '4': const [
     Response_ResponseType$json,
     Response_ErrorType$json,
     Response_ResponseNote$json
   ],
 };
 
-const Response_ResponseType$json = {
+@$core.Deprecated('Use responseDescriptor instead')
+const Response_ResponseType$json = const {
   '1': 'ResponseType',
-  '2': [
-    {'1': 'SUCCESS_ATOM', '2': 1},
-    {'1': 'SUCCESS_SEQUENCE', '2': 2},
-    {'1': 'SUCCESS_PARTIAL', '2': 3},
-    {'1': 'WAIT_COMPLETE', '2': 4},
-    {'1': 'SERVER_INFO', '2': 5},
-    {'1': 'CLIENT_ERROR', '2': 16},
-    {'1': 'COMPILE_ERROR', '2': 17},
-    {'1': 'RUNTIME_ERROR', '2': 18},
+  '2': const [
+    const {'1': 'SUCCESS_ATOM', '2': 1},
+    const {'1': 'SUCCESS_SEQUENCE', '2': 2},
+    const {'1': 'SUCCESS_PARTIAL', '2': 3},
+    const {'1': 'WAIT_COMPLETE', '2': 4},
+    const {'1': 'SERVER_INFO', '2': 5},
+    const {'1': 'CLIENT_ERROR', '2': 16},
+    const {'1': 'COMPILE_ERROR', '2': 17},
+    const {'1': 'RUNTIME_ERROR', '2': 18},
   ],
 };
 
-const Response_ErrorType$json = {
+@$core.Deprecated('Use responseDescriptor instead')
+const Response_ErrorType$json = const {
   '1': 'ErrorType',
-  '2': [
-    {'1': 'INTERNAL', '2': 1000000},
-    {'1': 'RESOURCE_LIMIT', '2': 2000000},
-    {'1': 'QUERY_LOGIC', '2': 3000000},
-    {'1': 'NON_EXISTENCE', '2': 3100000},
-    {'1': 'OP_FAILED', '2': 4100000},
-    {'1': 'OP_INDETERMINATE', '2': 4200000},
-    {'1': 'USER', '2': 5000000},
-    {'1': 'PERMISSION_ERROR', '2': 6000000},
+  '2': const [
+    const {'1': 'INTERNAL', '2': 1000000},
+    const {'1': 'RESOURCE_LIMIT', '2': 2000000},
+    const {'1': 'QUERY_LOGIC', '2': 3000000},
+    const {'1': 'NON_EXISTENCE', '2': 3100000},
+    const {'1': 'OP_FAILED', '2': 4100000},
+    const {'1': 'OP_INDETERMINATE', '2': 4200000},
+    const {'1': 'USER', '2': 5000000},
+    const {'1': 'PERMISSION_ERROR', '2': 6000000},
   ],
 };
 
-const Response_ResponseNote$json = {
+@$core.Deprecated('Use responseDescriptor instead')
+const Response_ResponseNote$json = const {
   '1': 'ResponseNote',
-  '2': [
-    {'1': 'SEQUENCE_FEED', '2': 1},
-    {'1': 'ATOM_FEED', '2': 2},
-    {'1': 'ORDER_BY_LIMIT_FEED', '2': 3},
-    {'1': 'UNIONED_FEED', '2': 4},
-    {'1': 'INCLUDES_STATES', '2': 5},
+  '2': const [
+    const {'1': 'SEQUENCE_FEED', '2': 1},
+    const {'1': 'ATOM_FEED', '2': 2},
+    const {'1': 'ORDER_BY_LIMIT_FEED', '2': 3},
+    const {'1': 'UNIONED_FEED', '2': 4},
+    const {'1': 'INCLUDES_STATES', '2': 5},
   ],
 };
 
-const Datum$json = {
+/// Descriptor for `Response`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List responseDescriptor = $convert.base64Decode(
+    'CghSZXNwb25zZRIqCgR0eXBlGAEgASgOMhYuUmVzcG9uc2UuUmVzcG9uc2VUeXBlUgR0eXBlEjIKCmVycm9yX3R5cGUYByABKA4yEy5SZXNwb25zZS5FcnJvclR5cGVSCWVycm9yVHlwZRIsCgVub3RlcxgGIAMoDjIWLlJlc3BvbnNlLlJlc3BvbnNlTm90ZVIFbm90ZXMSFAoFdG9rZW4YAiABKANSBXRva2VuEiIKCHJlc3BvbnNlGAMgAygLMgYuRGF0dW1SCHJlc3BvbnNlEigKCWJhY2t0cmFjZRgEIAEoCzIKLkJhY2t0cmFjZVIJYmFja3RyYWNlEiAKB3Byb2ZpbGUYBSABKAsyBi5EYXR1bVIHcHJvZmlsZSKnAQoMUmVzcG9uc2VUeXBlEhAKDFNVQ0NFU1NfQVRPTRABEhQKEFNVQ0NFU1NfU0VRVUVOQ0UQAhITCg9TVUNDRVNTX1BBUlRJQUwQAxIRCg1XQUlUX0NPTVBMRVRFEAQSDwoLU0VSVkVSX0lORk8QBRIQCgxDTElFTlRfRVJST1IQEBIRCg1DT01QSUxFX0VSUk9SEBESEQoNUlVOVElNRV9FUlJPUhASIqwBCglFcnJvclR5cGUSDgoISU5URVJOQUwQwIQ9EhQKDlJFU09VUkNFX0xJTUlUEICJehISCgtRVUVSWV9MT0dJQxDAjbcBEhQKDU5PTl9FWElTVEVOQ0UQ4Jq9ARIQCglPUF9GQUlMRUQQoJ/6ARIXChBPUF9JTkRFVEVSTUlOQVRFEMCsgAISCwoEVVNFUhDAlrECEhcKEFBFUk1JU1NJT05fRVJST1IQgJvuAiJwCgxSZXNwb25zZU5vdGUSEQoNU0VRVUVOQ0VfRkVFRBABEg0KCUFUT01fRkVFRBACEhcKE09SREVSX0JZX0xJTUlUX0ZFRUQQAxIQCgxVTklPTkVEX0ZFRUQQBBITCg9JTkNMVURFU19TVEFURVMQBQ==');
+@$core.Deprecated('Use datumDescriptor instead')
+const Datum$json = const {
   '1': 'Datum',
-  '2': [
-    {
+  '2': const [
+    const {
       '1': 'type',
       '3': 1,
       '4': 1,
@@ -218,11 +272,18 @@ const Datum$json = {
       '6': '.Datum.DatumType',
       '10': 'type'
     },
-    {'1': 'r_bool', '3': 2, '4': 1, '5': 8, '10': 'rBool'},
-    {'1': 'r_num', '3': 3, '4': 1, '5': 1, '10': 'rNum'},
-    {'1': 'r_str', '3': 4, '4': 1, '5': 9, '10': 'rStr'},
-    {'1': 'r_array', '3': 5, '4': 3, '5': 11, '6': '.Datum', '10': 'rArray'},
-    {
+    const {'1': 'r_bool', '3': 2, '4': 1, '5': 8, '10': 'rBool'},
+    const {'1': 'r_num', '3': 3, '4': 1, '5': 1, '10': 'rNum'},
+    const {'1': 'r_str', '3': 4, '4': 1, '5': 9, '10': 'rStr'},
+    const {
+      '1': 'r_array',
+      '3': 5,
+      '4': 3,
+      '5': 11,
+      '6': '.Datum',
+      '10': 'rArray'
+    },
+    const {
       '1': 'r_object',
       '3': 6,
       '4': 3,
@@ -231,38 +292,51 @@ const Datum$json = {
       '10': 'rObject'
     },
   ],
-  '3': [Datum_AssocPair$json],
-  '4': [Datum_DatumType$json],
+  '3': const [Datum_AssocPair$json],
+  '4': const [Datum_DatumType$json],
 };
 
-const Datum_AssocPair$json = {
+@$core.Deprecated('Use datumDescriptor instead')
+const Datum_AssocPair$json = const {
   '1': 'AssocPair',
-  '2': [
-    {'1': 'key', '3': 1, '4': 1, '5': 9, '10': 'key'},
-    {'1': 'val', '3': 2, '4': 1, '5': 11, '6': '.Datum', '10': 'val'},
+  '2': const [
+    const {'1': 'key', '3': 1, '4': 1, '5': 9, '10': 'key'},
+    const {'1': 'val', '3': 2, '4': 1, '5': 11, '6': '.Datum', '10': 'val'},
   ],
 };
 
-const Datum_DatumType$json = {
+@$core.Deprecated('Use datumDescriptor instead')
+const Datum_DatumType$json = const {
   '1': 'DatumType',
-  '2': [
-    {'1': 'R_NULL', '2': 1},
-    {'1': 'R_BOOL', '2': 2},
-    {'1': 'R_NUM', '2': 3},
-    {'1': 'R_STR', '2': 4},
-    {'1': 'R_ARRAY', '2': 5},
-    {'1': 'R_OBJECT', '2': 6},
-    {'1': 'R_JSON', '2': 7},
+  '2': const [
+    const {'1': 'R_NULL', '2': 1},
+    const {'1': 'R_BOOL', '2': 2},
+    const {'1': 'R_NUM', '2': 3},
+    const {'1': 'R_STR', '2': 4},
+    const {'1': 'R_ARRAY', '2': 5},
+    const {'1': 'R_OBJECT', '2': 6},
+    const {'1': 'R_JSON', '2': 7},
   ],
 };
 
-const Term$json = {
+/// Descriptor for `Datum`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List datumDescriptor = $convert.base64Decode(
+    'CgVEYXR1bRIkCgR0eXBlGAEgASgOMhAuRGF0dW0uRGF0dW1UeXBlUgR0eXBlEhUKBnJfYm9vbBgCIAEoCFIFckJvb2wSEwoFcl9udW0YAyABKAFSBHJOdW0SEwoFcl9zdHIYBCABKAlSBHJTdHISHwoHcl9hcnJheRgFIAMoCzIGLkRhdHVtUgZyQXJyYXkSKwoIcl9vYmplY3QYBiADKAsyEC5EYXR1bS5Bc3NvY1BhaXJSB3JPYmplY3QaNwoJQXNzb2NQYWlyEhAKA2tleRgBIAEoCVIDa2V5EhgKA3ZhbBgCIAEoCzIGLkRhdHVtUgN2YWwiYAoJRGF0dW1UeXBlEgoKBlJfTlVMTBABEgoKBlJfQk9PTBACEgkKBVJfTlVNEAMSCQoFUl9TVFIQBBILCgdSX0FSUkFZEAUSDAoIUl9PQkpFQ1QQBhIKCgZSX0pTT04QBw==');
+@$core.Deprecated('Use termDescriptor instead')
+const Term$json = const {
   '1': 'Term',
-  '2': [
-    {'1': 'type', '3': 1, '4': 1, '5': 14, '6': '.Term.TermType', '10': 'type'},
-    {'1': 'datum', '3': 2, '4': 1, '5': 11, '6': '.Datum', '10': 'datum'},
-    {'1': 'args', '3': 3, '4': 3, '5': 11, '6': '.Term', '10': 'args'},
-    {
+  '2': const [
+    const {
+      '1': 'type',
+      '3': 1,
+      '4': 1,
+      '5': 14,
+      '6': '.Term.TermType',
+      '10': 'type'
+    },
+    const {'1': 'datum', '3': 2, '4': 1, '5': 11, '6': '.Datum', '10': 'datum'},
+    const {'1': 'args', '3': 3, '4': 3, '5': 11, '6': '.Term', '10': 'args'},
+    const {
       '1': 'optargs',
       '3': 4,
       '4': 3,
@@ -271,206 +345,212 @@ const Term$json = {
       '10': 'optargs'
     },
   ],
-  '3': [Term_AssocPair$json],
-  '4': [Term_TermType$json],
+  '3': const [Term_AssocPair$json],
+  '4': const [Term_TermType$json],
 };
 
-const Term_AssocPair$json = {
+@$core.Deprecated('Use termDescriptor instead')
+const Term_AssocPair$json = const {
   '1': 'AssocPair',
-  '2': [
-    {'1': 'key', '3': 1, '4': 1, '5': 9, '10': 'key'},
-    {'1': 'val', '3': 2, '4': 1, '5': 11, '6': '.Term', '10': 'val'},
+  '2': const [
+    const {'1': 'key', '3': 1, '4': 1, '5': 9, '10': 'key'},
+    const {'1': 'val', '3': 2, '4': 1, '5': 11, '6': '.Term', '10': 'val'},
   ],
 };
 
-const Term_TermType$json = {
+@$core.Deprecated('Use termDescriptor instead')
+const Term_TermType$json = const {
   '1': 'TermType',
-  '2': [
-    {'1': 'DATUM', '2': 1},
-    {'1': 'MAKE_ARRAY', '2': 2},
-    {'1': 'MAKE_OBJ', '2': 3},
-    {'1': 'VAR', '2': 10},
-    {'1': 'JAVASCRIPT', '2': 11},
-    {'1': 'UUID', '2': 169},
-    {'1': 'HTTP', '2': 153},
-    {'1': 'ERROR', '2': 12},
-    {'1': 'IMPLICIT_VAR', '2': 13},
-    {'1': 'DB', '2': 14},
-    {'1': 'TABLE', '2': 15},
-    {'1': 'GET', '2': 16},
-    {'1': 'GET_ALL', '2': 78},
-    {'1': 'EQ', '2': 17},
-    {'1': 'NE', '2': 18},
-    {'1': 'LT', '2': 19},
-    {'1': 'LE', '2': 20},
-    {'1': 'GT', '2': 21},
-    {'1': 'GE', '2': 22},
-    {'1': 'NOT', '2': 23},
-    {'1': 'ADD', '2': 24},
-    {'1': 'SUB', '2': 25},
-    {'1': 'MUL', '2': 26},
-    {'1': 'DIV', '2': 27},
-    {'1': 'MOD', '2': 28},
-    {'1': 'FLOOR', '2': 183},
-    {'1': 'CEIL', '2': 184},
-    {'1': 'ROUND', '2': 185},
-    {'1': 'APPEND', '2': 29},
-    {'1': 'PREPEND', '2': 80},
-    {'1': 'DIFFERENCE', '2': 95},
-    {'1': 'SET_INSERT', '2': 88},
-    {'1': 'SET_INTERSECTION', '2': 89},
-    {'1': 'SET_UNION', '2': 90},
-    {'1': 'SET_DIFFERENCE', '2': 91},
-    {'1': 'SLICE', '2': 30},
-    {'1': 'SKIP', '2': 70},
-    {'1': 'LIMIT', '2': 71},
-    {'1': 'OFFSETS_OF', '2': 87},
-    {'1': 'CONTAINS', '2': 93},
-    {'1': 'GET_FIELD', '2': 31},
-    {'1': 'KEYS', '2': 94},
-    {'1': 'VALUES', '2': 186},
-    {'1': 'OBJECT', '2': 143},
-    {'1': 'HAS_FIELDS', '2': 32},
-    {'1': 'WITH_FIELDS', '2': 96},
-    {'1': 'PLUCK', '2': 33},
-    {'1': 'WITHOUT', '2': 34},
-    {'1': 'MERGE', '2': 35},
-    {'1': 'BETWEEN_DEPRECATED', '2': 36},
-    {'1': 'BETWEEN', '2': 182},
-    {'1': 'REDUCE', '2': 37},
-    {'1': 'MAP', '2': 38},
-    {'1': 'FOLD', '2': 187},
-    {'1': 'FILTER', '2': 39},
-    {'1': 'CONCAT_MAP', '2': 40},
-    {'1': 'ORDER_BY', '2': 41},
-    {'1': 'DISTINCT', '2': 42},
-    {'1': 'COUNT', '2': 43},
-    {'1': 'IS_EMPTY', '2': 86},
-    {'1': 'UNION', '2': 44},
-    {'1': 'NTH', '2': 45},
-    {'1': 'BRACKET', '2': 170},
-    {'1': 'INNER_JOIN', '2': 48},
-    {'1': 'OUTER_JOIN', '2': 49},
-    {'1': 'EQ_JOIN', '2': 50},
-    {'1': 'ZIP', '2': 72},
-    {'1': 'RANGE', '2': 173},
-    {'1': 'INSERT_AT', '2': 82},
-    {'1': 'DELETE_AT', '2': 83},
-    {'1': 'CHANGE_AT', '2': 84},
-    {'1': 'SPLICE_AT', '2': 85},
-    {'1': 'COERCE_TO', '2': 51},
-    {'1': 'TYPE_OF', '2': 52},
-    {'1': 'UPDATE', '2': 53},
-    {'1': 'DELETE', '2': 54},
-    {'1': 'REPLACE', '2': 55},
-    {'1': 'INSERT', '2': 56},
-    {'1': 'DB_CREATE', '2': 57},
-    {'1': 'DB_DROP', '2': 58},
-    {'1': 'DB_LIST', '2': 59},
-    {'1': 'TABLE_CREATE', '2': 60},
-    {'1': 'TABLE_DROP', '2': 61},
-    {'1': 'TABLE_LIST', '2': 62},
-    {'1': 'CONFIG', '2': 174},
-    {'1': 'STATUS', '2': 175},
-    {'1': 'WAIT', '2': 177},
-    {'1': 'RECONFIGURE', '2': 176},
-    {'1': 'REBALANCE', '2': 179},
-    {'1': 'SYNC', '2': 138},
-    {'1': 'GRANT', '2': 188},
-    {'1': 'INDEX_CREATE', '2': 75},
-    {'1': 'INDEX_DROP', '2': 76},
-    {'1': 'INDEX_LIST', '2': 77},
-    {'1': 'INDEX_STATUS', '2': 139},
-    {'1': 'INDEX_WAIT', '2': 140},
-    {'1': 'INDEX_RENAME', '2': 156},
-    {'1': 'SET_WRITE_HOOK', '2': 189},
-    {'1': 'GET_WRITE_HOOK', '2': 190},
-    {'1': 'FUNCALL', '2': 64},
-    {'1': 'BRANCH', '2': 65},
-    {'1': 'OR', '2': 66},
-    {'1': 'AND', '2': 67},
-    {'1': 'FOR_EACH', '2': 68},
-    {'1': 'FUNC', '2': 69},
-    {'1': 'ASC', '2': 73},
-    {'1': 'DESC', '2': 74},
-    {'1': 'INFO', '2': 79},
-    {'1': 'MATCH', '2': 97},
-    {'1': 'UPCASE', '2': 141},
-    {'1': 'DOWNCASE', '2': 142},
-    {'1': 'SAMPLE', '2': 81},
-    {'1': 'DEFAULT', '2': 92},
-    {'1': 'JSON', '2': 98},
-    {'1': 'ISO8601', '2': 99},
-    {'1': 'TO_ISO8601', '2': 100},
-    {'1': 'EPOCH_TIME', '2': 101},
-    {'1': 'TO_EPOCH_TIME', '2': 102},
-    {'1': 'NOW', '2': 103},
-    {'1': 'IN_TIMEZONE', '2': 104},
-    {'1': 'DURING', '2': 105},
-    {'1': 'DATE', '2': 106},
-    {'1': 'TIME_OF_DAY', '2': 126},
-    {'1': 'TIMEZONE', '2': 127},
-    {'1': 'YEAR', '2': 128},
-    {'1': 'MONTH', '2': 129},
-    {'1': 'DAY', '2': 130},
-    {'1': 'DAY_OF_WEEK', '2': 131},
-    {'1': 'DAY_OF_YEAR', '2': 132},
-    {'1': 'HOURS', '2': 133},
-    {'1': 'MINUTES', '2': 134},
-    {'1': 'SECONDS', '2': 135},
-    {'1': 'TIME', '2': 136},
-    {'1': 'MONDAY', '2': 107},
-    {'1': 'TUESDAY', '2': 108},
-    {'1': 'WEDNESDAY', '2': 109},
-    {'1': 'THURSDAY', '2': 110},
-    {'1': 'FRIDAY', '2': 111},
-    {'1': 'SATURDAY', '2': 112},
-    {'1': 'SUNDAY', '2': 113},
-    {'1': 'JANUARY', '2': 114},
-    {'1': 'FEBRUARY', '2': 115},
-    {'1': 'MARCH', '2': 116},
-    {'1': 'APRIL', '2': 117},
-    {'1': 'MAY', '2': 118},
-    {'1': 'JUNE', '2': 119},
-    {'1': 'JULY', '2': 120},
-    {'1': 'AUGUST', '2': 121},
-    {'1': 'SEPTEMBER', '2': 122},
-    {'1': 'OCTOBER', '2': 123},
-    {'1': 'NOVEMBER', '2': 124},
-    {'1': 'DECEMBER', '2': 125},
-    {'1': 'LITERAL', '2': 137},
-    {'1': 'GROUP', '2': 144},
-    {'1': 'SUM', '2': 145},
-    {'1': 'AVG', '2': 146},
-    {'1': 'MIN', '2': 147},
-    {'1': 'MAX', '2': 148},
-    {'1': 'SPLIT', '2': 149},
-    {'1': 'UNGROUP', '2': 150},
-    {'1': 'RANDOM', '2': 151},
-    {'1': 'CHANGES', '2': 152},
-    {'1': 'ARGS', '2': 154},
-    {'1': 'BINARY', '2': 155},
-    {'1': 'GEOJSON', '2': 157},
-    {'1': 'TO_GEOJSON', '2': 158},
-    {'1': 'POINT', '2': 159},
-    {'1': 'LINE', '2': 160},
-    {'1': 'POLYGON', '2': 161},
-    {'1': 'DISTANCE', '2': 162},
-    {'1': 'INTERSECTS', '2': 163},
-    {'1': 'INCLUDES', '2': 164},
-    {'1': 'CIRCLE', '2': 165},
-    {'1': 'GET_INTERSECTING', '2': 166},
-    {'1': 'FILL', '2': 167},
-    {'1': 'GET_NEAREST', '2': 168},
-    {'1': 'POLYGON_SUB', '2': 171},
-    {'1': 'TO_JSON_STRING', '2': 172},
-    {'1': 'MINVAL', '2': 180},
-    {'1': 'MAXVAL', '2': 181},
-    {'1': 'BIT_AND', '2': 191},
-    {'1': 'BIT_OR', '2': 192},
-    {'1': 'BIT_XOR', '2': 193},
-    {'1': 'BIT_NOT', '2': 194},
-    {'1': 'BIT_SAL', '2': 195},
-    {'1': 'BIT_SAR', '2': 196},
+  '2': const [
+    const {'1': 'DATUM', '2': 1},
+    const {'1': 'MAKE_ARRAY', '2': 2},
+    const {'1': 'MAKE_OBJ', '2': 3},
+    const {'1': 'VAR', '2': 10},
+    const {'1': 'JAVASCRIPT', '2': 11},
+    const {'1': 'UUID', '2': 169},
+    const {'1': 'HTTP', '2': 153},
+    const {'1': 'ERROR', '2': 12},
+    const {'1': 'IMPLICIT_VAR', '2': 13},
+    const {'1': 'DB', '2': 14},
+    const {'1': 'TABLE', '2': 15},
+    const {'1': 'GET', '2': 16},
+    const {'1': 'GET_ALL', '2': 78},
+    const {'1': 'EQ', '2': 17},
+    const {'1': 'NE', '2': 18},
+    const {'1': 'LT', '2': 19},
+    const {'1': 'LE', '2': 20},
+    const {'1': 'GT', '2': 21},
+    const {'1': 'GE', '2': 22},
+    const {'1': 'NOT', '2': 23},
+    const {'1': 'ADD', '2': 24},
+    const {'1': 'SUB', '2': 25},
+    const {'1': 'MUL', '2': 26},
+    const {'1': 'DIV', '2': 27},
+    const {'1': 'MOD', '2': 28},
+    const {'1': 'FLOOR', '2': 183},
+    const {'1': 'CEIL', '2': 184},
+    const {'1': 'ROUND', '2': 185},
+    const {'1': 'APPEND', '2': 29},
+    const {'1': 'PREPEND', '2': 80},
+    const {'1': 'DIFFERENCE', '2': 95},
+    const {'1': 'SET_INSERT', '2': 88},
+    const {'1': 'SET_INTERSECTION', '2': 89},
+    const {'1': 'SET_UNION', '2': 90},
+    const {'1': 'SET_DIFFERENCE', '2': 91},
+    const {'1': 'SLICE', '2': 30},
+    const {'1': 'SKIP', '2': 70},
+    const {'1': 'LIMIT', '2': 71},
+    const {'1': 'OFFSETS_OF', '2': 87},
+    const {'1': 'CONTAINS', '2': 93},
+    const {'1': 'GET_FIELD', '2': 31},
+    const {'1': 'KEYS', '2': 94},
+    const {'1': 'VALUES', '2': 186},
+    const {'1': 'OBJECT', '2': 143},
+    const {'1': 'HAS_FIELDS', '2': 32},
+    const {'1': 'WITH_FIELDS', '2': 96},
+    const {'1': 'PLUCK', '2': 33},
+    const {'1': 'WITHOUT', '2': 34},
+    const {'1': 'MERGE', '2': 35},
+    const {'1': 'BETWEEN_DEPRECATED', '2': 36},
+    const {'1': 'BETWEEN', '2': 182},
+    const {'1': 'REDUCE', '2': 37},
+    const {'1': 'MAP', '2': 38},
+    const {'1': 'FOLD', '2': 187},
+    const {'1': 'FILTER', '2': 39},
+    const {'1': 'CONCAT_MAP', '2': 40},
+    const {'1': 'ORDER_BY', '2': 41},
+    const {'1': 'DISTINCT', '2': 42},
+    const {'1': 'COUNT', '2': 43},
+    const {'1': 'IS_EMPTY', '2': 86},
+    const {'1': 'UNION', '2': 44},
+    const {'1': 'NTH', '2': 45},
+    const {'1': 'BRACKET', '2': 170},
+    const {'1': 'INNER_JOIN', '2': 48},
+    const {'1': 'OUTER_JOIN', '2': 49},
+    const {'1': 'EQ_JOIN', '2': 50},
+    const {'1': 'ZIP', '2': 72},
+    const {'1': 'RANGE', '2': 173},
+    const {'1': 'INSERT_AT', '2': 82},
+    const {'1': 'DELETE_AT', '2': 83},
+    const {'1': 'CHANGE_AT', '2': 84},
+    const {'1': 'SPLICE_AT', '2': 85},
+    const {'1': 'COERCE_TO', '2': 51},
+    const {'1': 'TYPE_OF', '2': 52},
+    const {'1': 'UPDATE', '2': 53},
+    const {'1': 'DELETE', '2': 54},
+    const {'1': 'REPLACE', '2': 55},
+    const {'1': 'INSERT', '2': 56},
+    const {'1': 'DB_CREATE', '2': 57},
+    const {'1': 'DB_DROP', '2': 58},
+    const {'1': 'DB_LIST', '2': 59},
+    const {'1': 'TABLE_CREATE', '2': 60},
+    const {'1': 'TABLE_DROP', '2': 61},
+    const {'1': 'TABLE_LIST', '2': 62},
+    const {'1': 'CONFIG', '2': 174},
+    const {'1': 'STATUS', '2': 175},
+    const {'1': 'WAIT', '2': 177},
+    const {'1': 'RECONFIGURE', '2': 176},
+    const {'1': 'REBALANCE', '2': 179},
+    const {'1': 'SYNC', '2': 138},
+    const {'1': 'GRANT', '2': 188},
+    const {'1': 'INDEX_CREATE', '2': 75},
+    const {'1': 'INDEX_DROP', '2': 76},
+    const {'1': 'INDEX_LIST', '2': 77},
+    const {'1': 'INDEX_STATUS', '2': 139},
+    const {'1': 'INDEX_WAIT', '2': 140},
+    const {'1': 'INDEX_RENAME', '2': 156},
+    const {'1': 'SET_WRITE_HOOK', '2': 189},
+    const {'1': 'GET_WRITE_HOOK', '2': 190},
+    const {'1': 'FUNCALL', '2': 64},
+    const {'1': 'BRANCH', '2': 65},
+    const {'1': 'OR', '2': 66},
+    const {'1': 'AND', '2': 67},
+    const {'1': 'FOR_EACH', '2': 68},
+    const {'1': 'FUNC', '2': 69},
+    const {'1': 'ASC', '2': 73},
+    const {'1': 'DESC', '2': 74},
+    const {'1': 'INFO', '2': 79},
+    const {'1': 'MATCH', '2': 97},
+    const {'1': 'UPCASE', '2': 141},
+    const {'1': 'DOWNCASE', '2': 142},
+    const {'1': 'SAMPLE', '2': 81},
+    const {'1': 'DEFAULT', '2': 92},
+    const {'1': 'JSON', '2': 98},
+    const {'1': 'ISO8601', '2': 99},
+    const {'1': 'TO_ISO8601', '2': 100},
+    const {'1': 'EPOCH_TIME', '2': 101},
+    const {'1': 'TO_EPOCH_TIME', '2': 102},
+    const {'1': 'NOW', '2': 103},
+    const {'1': 'IN_TIMEZONE', '2': 104},
+    const {'1': 'DURING', '2': 105},
+    const {'1': 'DATE', '2': 106},
+    const {'1': 'TIME_OF_DAY', '2': 126},
+    const {'1': 'TIMEZONE', '2': 127},
+    const {'1': 'YEAR', '2': 128},
+    const {'1': 'MONTH', '2': 129},
+    const {'1': 'DAY', '2': 130},
+    const {'1': 'DAY_OF_WEEK', '2': 131},
+    const {'1': 'DAY_OF_YEAR', '2': 132},
+    const {'1': 'HOURS', '2': 133},
+    const {'1': 'MINUTES', '2': 134},
+    const {'1': 'SECONDS', '2': 135},
+    const {'1': 'TIME', '2': 136},
+    const {'1': 'MONDAY', '2': 107},
+    const {'1': 'TUESDAY', '2': 108},
+    const {'1': 'WEDNESDAY', '2': 109},
+    const {'1': 'THURSDAY', '2': 110},
+    const {'1': 'FRIDAY', '2': 111},
+    const {'1': 'SATURDAY', '2': 112},
+    const {'1': 'SUNDAY', '2': 113},
+    const {'1': 'JANUARY', '2': 114},
+    const {'1': 'FEBRUARY', '2': 115},
+    const {'1': 'MARCH', '2': 116},
+    const {'1': 'APRIL', '2': 117},
+    const {'1': 'MAY', '2': 118},
+    const {'1': 'JUNE', '2': 119},
+    const {'1': 'JULY', '2': 120},
+    const {'1': 'AUGUST', '2': 121},
+    const {'1': 'SEPTEMBER', '2': 122},
+    const {'1': 'OCTOBER', '2': 123},
+    const {'1': 'NOVEMBER', '2': 124},
+    const {'1': 'DECEMBER', '2': 125},
+    const {'1': 'LITERAL', '2': 137},
+    const {'1': 'GROUP', '2': 144},
+    const {'1': 'SUM', '2': 145},
+    const {'1': 'AVG', '2': 146},
+    const {'1': 'MIN', '2': 147},
+    const {'1': 'MAX', '2': 148},
+    const {'1': 'SPLIT', '2': 149},
+    const {'1': 'UNGROUP', '2': 150},
+    const {'1': 'RANDOM', '2': 151},
+    const {'1': 'CHANGES', '2': 152},
+    const {'1': 'ARGS', '2': 154},
+    const {'1': 'BINARY', '2': 155},
+    const {'1': 'GEOJSON', '2': 157},
+    const {'1': 'TO_GEOJSON', '2': 158},
+    const {'1': 'POINT', '2': 159},
+    const {'1': 'LINE', '2': 160},
+    const {'1': 'POLYGON', '2': 161},
+    const {'1': 'DISTANCE', '2': 162},
+    const {'1': 'INTERSECTS', '2': 163},
+    const {'1': 'INCLUDES', '2': 164},
+    const {'1': 'CIRCLE', '2': 165},
+    const {'1': 'GET_INTERSECTING', '2': 166},
+    const {'1': 'FILL', '2': 167},
+    const {'1': 'GET_NEAREST', '2': 168},
+    const {'1': 'POLYGON_SUB', '2': 171},
+    const {'1': 'TO_JSON_STRING', '2': 172},
+    const {'1': 'MINVAL', '2': 180},
+    const {'1': 'MAXVAL', '2': 181},
+    const {'1': 'BIT_AND', '2': 191},
+    const {'1': 'BIT_OR', '2': 192},
+    const {'1': 'BIT_XOR', '2': 193},
+    const {'1': 'BIT_NOT', '2': 194},
+    const {'1': 'BIT_SAL', '2': 195},
+    const {'1': 'BIT_SAR', '2': 196},
   ],
 };
+
+/// Descriptor for `Term`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List termDescriptor = $convert.base64Decode(
+    'CgRUZXJtEiIKBHR5cGUYASABKA4yDi5UZXJtLlRlcm1UeXBlUgR0eXBlEhwKBWRhdHVtGAIgASgLMgYuRGF0dW1SBWRhdHVtEhkKBGFyZ3MYAyADKAsyBS5UZXJtUgRhcmdzEikKB29wdGFyZ3MYBCADKAsyDy5UZXJtLkFzc29jUGFpclIHb3B0YXJncxo2CglBc3NvY1BhaXISEAoDa2V5GAEgASgJUgNrZXkSFwoDdmFsGAIgASgLMgUuVGVybVIDdmFsIp0TCghUZXJtVHlwZRIJCgVEQVRVTRABEg4KCk1BS0VfQVJSQVkQAhIMCghNQUtFX09CShADEgcKA1ZBUhAKEg4KCkpBVkFTQ1JJUFQQCxIJCgRVVUlEEKkBEgkKBEhUVFAQmQESCQoFRVJST1IQDBIQCgxJTVBMSUNJVF9WQVIQDRIGCgJEQhAOEgkKBVRBQkxFEA8SBwoDR0VUEBASCwoHR0VUX0FMTBBOEgYKAkVREBESBgoCTkUQEhIGCgJMVBATEgYKAkxFEBQSBgoCR1QQFRIGCgJHRRAWEgcKA05PVBAXEgcKA0FERBAYEgcKA1NVQhAZEgcKA01VTBAaEgcKA0RJVhAbEgcKA01PRBAcEgoKBUZMT09SELcBEgkKBENFSUwQuAESCgoFUk9VTkQQuQESCgoGQVBQRU5EEB0SCwoHUFJFUEVORBBQEg4KCkRJRkZFUkVOQ0UQXxIOCgpTRVRfSU5TRVJUEFgSFAoQU0VUX0lOVEVSU0VDVElPThBZEg0KCVNFVF9VTklPThBaEhIKDlNFVF9ESUZGRVJFTkNFEFsSCQoFU0xJQ0UQHhIICgRTS0lQEEYSCQoFTElNSVQQRxIOCgpPRkZTRVRTX09GEFcSDAoIQ09OVEFJTlMQXRINCglHRVRfRklFTEQQHxIICgRLRVlTEF4SCwoGVkFMVUVTELoBEgsKBk9CSkVDVBCPARIOCgpIQVNfRklFTERTECASDwoLV0lUSF9GSUVMRFMQYBIJCgVQTFVDSxAhEgsKB1dJVEhPVVQQIhIJCgVNRVJHRRAjEhYKEkJFVFdFRU5fREVQUkVDQVRFRBAkEgwKB0JFVFdFRU4QtgESCgoGUkVEVUNFECUSBwoDTUFQECYSCQoERk9MRBC7ARIKCgZGSUxURVIQJxIOCgpDT05DQVRfTUFQECgSDAoIT1JERVJfQlkQKRIMCghESVNUSU5DVBAqEgkKBUNPVU5UECsSDAoISVNfRU1QVFkQVhIJCgVVTklPThAsEgcKA05USBAtEgwKB0JSQUNLRVQQqgESDgoKSU5ORVJfSk9JThAwEg4KCk9VVEVSX0pPSU4QMRILCgdFUV9KT0lOEDISBwoDWklQEEgSCgoFUkFOR0UQrQESDQoJSU5TRVJUX0FUEFISDQoJREVMRVRFX0FUEFMSDQoJQ0hBTkdFX0FUEFQSDQoJU1BMSUNFX0FUEFUSDQoJQ09FUkNFX1RPEDMSCwoHVFlQRV9PRhA0EgoKBlVQREFURRA1EgoKBkRFTEVURRA2EgsKB1JFUExBQ0UQNxIKCgZJTlNFUlQQOBINCglEQl9DUkVBVEUQORILCgdEQl9EUk9QEDoSCwoHREJfTElTVBA7EhAKDFRBQkxFX0NSRUFURRA8Eg4KClRBQkxFX0RST1AQPRIOCgpUQUJMRV9MSVNUED4SCwoGQ09ORklHEK4BEgsKBlNUQVRVUxCvARIJCgRXQUlUELEBEhAKC1JFQ09ORklHVVJFELABEg4KCVJFQkFMQU5DRRCzARIJCgRTWU5DEIoBEgoKBUdSQU5UELwBEhAKDElOREVYX0NSRUFURRBLEg4KCklOREVYX0RST1AQTBIOCgpJTkRFWF9MSVNUEE0SEQoMSU5ERVhfU1RBVFVTEIsBEg8KCklOREVYX1dBSVQQjAESEQoMSU5ERVhfUkVOQU1FEJwBEhMKDlNFVF9XUklURV9IT09LEL0BEhMKDkdFVF9XUklURV9IT09LEL4BEgsKB0ZVTkNBTEwQQBIKCgZCUkFOQ0gQQRIGCgJPUhBCEgcKA0FORBBDEgwKCEZPUl9FQUNIEEQSCAoERlVOQxBFEgcKA0FTQxBJEggKBERFU0MQShIICgRJTkZPEE8SCQoFTUFUQ0gQYRILCgZVUENBU0UQjQESDQoIRE9XTkNBU0UQjgESCgoGU0FNUExFEFESCwoHREVGQVVMVBBcEggKBEpTT04QYhILCgdJU084NjAxEGMSDgoKVE9fSVNPODYwMRBkEg4KCkVQT0NIX1RJTUUQZRIRCg1UT19FUE9DSF9USU1FEGYSBwoDTk9XEGcSDwoLSU5fVElNRVpPTkUQaBIKCgZEVVJJTkcQaRIICgREQVRFEGoSDwoLVElNRV9PRl9EQVkQfhIMCghUSU1FWk9ORRB/EgkKBFlFQVIQgAESCgoFTU9OVEgQgQESCAoDREFZEIIBEhAKC0RBWV9PRl9XRUVLEIMBEhAKC0RBWV9PRl9ZRUFSEIQBEgoKBUhPVVJTEIUBEgwKB01JTlVURVMQhgESDAoHU0VDT05EUxCHARIJCgRUSU1FEIgBEgoKBk1PTkRBWRBrEgsKB1RVRVNEQVkQbBINCglXRURORVNEQVkQbRIMCghUSFVSU0RBWRBuEgoKBkZSSURBWRBvEgwKCFNBVFVSREFZEHASCgoGU1VOREFZEHESCwoHSkFOVUFSWRByEgwKCEZFQlJVQVJZEHMSCQoFTUFSQ0gQdBIJCgVBUFJJTBB1EgcKA01BWRB2EggKBEpVTkUQdxIICgRKVUxZEHgSCgoGQVVHVVNUEHkSDQoJU0VQVEVNQkVSEHoSCwoHT0NUT0JFUhB7EgwKCE5PVkVNQkVSEHwSDAoIREVDRU1CRVIQfRIMCgdMSVRFUkFMEIkBEgoKBUdST1VQEJABEggKA1NVTRCRARIICgNBVkcQkgESCAoDTUlOEJMBEggKA01BWBCUARIKCgVTUExJVBCVARIMCgdVTkdST1VQEJYBEgsKBlJBTkRPTRCXARIMCgdDSEFOR0VTEJgBEgkKBEFSR1MQmgESCwoGQklOQVJZEJsBEgwKB0dFT0pTT04QnQESDwoKVE9fR0VPSlNPThCeARIKCgVQT0lOVBCfARIJCgRMSU5FEKABEgwKB1BPTFlHT04QoQESDQoIRElTVEFOQ0UQogESDwoKSU5URVJTRUNUUxCjARINCghJTkNMVURFUxCkARILCgZDSVJDTEUQpQESFQoQR0VUX0lOVEVSU0VDVElORxCmARIJCgRGSUxMEKcBEhAKC0dFVF9ORUFSRVNUEKgBEhAKC1BPTFlHT05fU1VCEKsBEhMKDlRPX0pTT05fU1RSSU5HEKwBEgsKBk1JTlZBTBC0ARILCgZNQVhWQUwQtQESDAoHQklUX0FORBC/ARILCgZCSVRfT1IQwAESDAoHQklUX1hPUhDBARIMCgdCSVRfTk9UEMIBEgwKB0JJVF9TQUwQwwESDAoHQklUX1NBUhDEAQ==');
diff --git a/lib/src/generated/ql2.pbserver.dart b/lib/src/generated/ql2.pbserver.dart
index 466f3bb..f5a614a 100644
--- a/lib/src/generated/ql2.pbserver.dart
+++ b/lib/src/generated/ql2.pbserver.dart
@@ -2,7 +2,7 @@
 //  Generated code. Do not modify.
 //  source: ql2.proto
 //
-// @dart = 2.3
-// ignore_for_file: camel_case_types,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type
+// @dart = 2.12
+// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields,deprecated_member_use_from_same_package
 
 export 'ql2.pb.dart';
diff --git a/lib/src/net.dart b/lib/src/net.dart
index 797cd36..3781d3c 100644
--- a/lib/src/net.dart
+++ b/lib/src/net.dart
@@ -1,23 +1,23 @@
 part of rethinkdb;
 
 class Query extends RqlQuery {
-  p.Query_QueryType _type;
-  int _token;
-  RqlQuery _term;
-  Map _globalOptargs;
-  Cursor _cursor;
+  final p.Query_QueryType _type;
+  final int _token;
+  final RqlQuery? _term;
+  final Map? _globalOptargs;
+  Cursor? _cursor;
   final Completer _queryCompleter = Completer();
 
   Query(this._type, this._token, [this._term, this._globalOptargs]);
 
   serialize() {
-    List res = [_type.value];
+    var res = [_type.value];
     if (_term != null) {
-      res.add(_term.build());
+      res.add(_term!.build());
     }
     if (_globalOptargs != null) {
       Map optargs = {};
-      _globalOptargs.forEach((k, v) {
+      _globalOptargs!.forEach((k, v) {
         optargs[k] = v is RqlQuery ? v.build() : v;
       });
 
@@ -28,49 +28,49 @@ class Query extends RqlQuery {
 }
 
 class Response {
-  int _token;
-  int _type;
+  final int _token;
+  int? _type;
   var _data;
   var _backtrace;
   var _profile;
-  int _errorType;
-  List _notes = [];
+  int? _errorType;
+  List? _notes = [];
 
   Response(this._token, String jsonStr) {
     if (jsonStr.isNotEmpty) {
       Map fullResponse = json.decode(jsonStr);
-      this._type = fullResponse['t'];
-      this._data = fullResponse['r'];
-      this._backtrace = fullResponse['b'];
-      this._profile = fullResponse['p'];
-      this._notes = fullResponse['n'];
-      this._errorType = fullResponse['e'];
+      _type = fullResponse['t'];
+      _data = fullResponse['r'];
+      _backtrace = fullResponse['b'];
+      _profile = fullResponse['p'];
+      _notes = fullResponse['n'];
+      _errorType = fullResponse['e'];
     }
   }
 }
 
 class Connection {
-  Socket _socket;
+  Socket? _socket;
   static int _nextToken = 0;
-  String _host;
-  int _port;
+  final String _host;
+  final int _port;
   String _db;
-  String _user;
-  String _password;
-  int _protocolVersion = 0;
-  String _clientFirstMessage;
-  Digest _serverSignature;
-  Map _sslOpts;
+  final String _user;
+  final String _password;
+  final int _protocolVersion = 0;
+  String? _clientFirstMessage;
+  late Digest _serverSignature;
+  final Map? _sslOpts;
 
-  Completer<Connection> _completer = Completer();
+  final Completer<Connection> _completer = Completer();
 
   int _responseLength = 0;
-  List<int> _responseBuffer = [];
+  final List<int> _responseBuffer = [];
 
-  final Map _replyQueries = Map();
+  final Map _replyQueries = {};
   final Queue<Query> _sendQueue = Queue<Query>();
 
-  final Map<String, List> _listeners = Map<String, List>();
+  final Map<String, List> _listeners = <String, List>{};
 
   Connection(this._db, this._host, this._port, this._user, this._password,
       this._sslOpts);
@@ -84,7 +84,7 @@ class Connection {
   Future server() {
     RqlQuery query =
         Query(p.Query_QueryType.SERVER_INFO, _getToken(), null, null);
-    _sendQueue.add(query);
+    _sendQueue.add(query as Query);
     return _start(query);
   }
 
@@ -95,41 +95,40 @@ class Connection {
   Future<Connection> reconnect([bool noreplyWait = true]) {
     close(noreplyWait);
 
-    if (_listeners["connect"] != null) {
-      _listeners["connect"].forEach((func) => func());
+    if (_listeners['connect'] != null) {
+      _listeners['connect']!.forEach((func) => func());
     }
     var _sock = Socket.connect(_host, _port);
 
-    if (_sslOpts != null && _sslOpts.containsKey('ca')) {
-      SecurityContext context = SecurityContext()
-        ..setTrustedCertificates(_sslOpts['ca']);
+    if (_sslOpts != null && _sslOpts!.containsKey('ca')) {
+      var context = SecurityContext()..setTrustedCertificates(_sslOpts!['ca']);
       _sock = SecureSocket.connect(_host, _port, context: context);
     }
 
     _sock.catchError((err) {
       _completer.completeError(
-          RqlDriverError("Could not connect to $_host:$_port.  Error $err"));
+          RqlDriverError('Could not connect to $_host:$_port.  Error $err'));
     }).then((socket) {
       if (socket != null) {
         _socket = socket;
-        _socket.listen(_handleResponse, onDone: () {
-          if (_listeners["close"] != null) {
-            _listeners["close"].forEach((func) => func());
+        _socket!.listen(_handleResponse, onDone: () {
+          if (_listeners['close'] != null) {
+            _listeners['close']!.forEach((func) => func());
           }
         });
 
-        _clientFirstMessage = "n=$_user,r=" + _makeSalt();
-        String message = json.encode({
+        _clientFirstMessage = 'n=$_user,r=' + _makeSalt();
+        var message = json.encode({
           'protocol_version': _protocolVersion,
-          'authentication_method': "SCRAM-SHA-256",
-          'authentication': "n,,${_clientFirstMessage}"
+          'authentication_method': 'SCRAM-SHA-256',
+          'authentication': 'n,,$_clientFirstMessage'
         });
-        List<int> handshake =
-            List.from(_toBytes(p.VersionDummy_Version.V1_0.value))
+        var handshake =
+            List<int>.from(_toBytes(p.VersionDummy_Version.V1_0.value))
               ..addAll(message.codeUnits)
               ..add(0);
 
-        _socket.add(handshake);
+        _socket!.add(handshake);
       }
     });
     return _completer.future;
@@ -144,7 +143,7 @@ class Connection {
   }
 
   _handleAuthResponse(List<int> res) {
-    List<int> response = [];
+    var response = <int>[];
     for (final byte in res) {
       if (byte == 0) {
         _doHandshake(response);
@@ -156,8 +155,8 @@ class Connection {
   }
 
   _handleAuthError(Exception error) {
-    if (_listeners["error"] != null) {
-      _listeners["error"].forEach((func) => func(error));
+    if (_listeners['error'] != null) {
+      _listeners['error']!.forEach((func) => func(error));
     }
     _completer.completeError(error);
   }
@@ -167,68 +166,68 @@ class Connection {
 
     if (responseJSON.containsKey('success') && responseJSON['success']) {
       if (responseJSON.containsKey('max_protocol_version')) {
-        int max = responseJSON['max_protocol_version'];
+        int? max = responseJSON['max_protocol_version'];
         int min = responseJSON['min_protocol_version'];
-        if (min > _protocolVersion || max < _protocolVersion) {
+        if (min > _protocolVersion || max! < _protocolVersion) {
           //We don't actually support changing the protocol yet, so just error.
-          _handleAuthError(RqlDriverError(
-              """Unsupported protocol version ${_protocolVersion},
-                  expected between ${min} and ${max}."""));
+          _handleAuthError(
+              RqlDriverError('''Unsupported protocol version $_protocolVersion,
+                  expected between $min and $max.'''));
         }
       } else if (responseJSON.containsKey('authentication')) {
         String authString = responseJSON['authentication'];
         Map authMap = {};
-        List<String> authPieces = authString.split(',');
+        var authPieces = authString.split(',');
 
         authPieces.forEach((String piece) {
-          int i = piece.indexOf('=');
-          String key = piece.substring(0, i);
-          String val = piece.substring(i + 1);
+          var i = piece.indexOf('=');
+          var key = piece.substring(0, i);
+          var val = piece.substring(i + 1);
           authMap[key] = val;
         });
 
         if (authMap.containsKey('r')) {
-          String salt = String.fromCharCodes(base64.decode(authMap['s']));
+          var salt = String.fromCharCodes(base64.decode(authMap['s']));
 
-          PBKDF2 gen = PBKDF2(hash: sha256);
+          var gen = PBKDF2NS(hash: sha256);
 
-          int i = int.parse(authMap['i']);
+          var i = int.parse(authMap['i']);
 
-          String clientFinalMessageWithoutProof = "c=biws,r=" + authMap['r'];
+          var clientFinalMessageWithoutProof = 'c=biws,r=' + authMap['r'];
 
-          List<int> saltedPassword = gen.generateKey(_password, salt, i, 32);
+          var saltedPassword = gen.generateKey(_password, salt, i, 32);
 
-          Digest clientKey =
-              Hmac(sha256, saltedPassword).convert("Client Key".codeUnits);
+          var clientKey =
+              Hmac(sha256, saltedPassword).convert('Client Key'.codeUnits);
 
-          Digest storedKey = sha256.convert(clientKey.bytes);
+          var storedKey = sha256.convert(clientKey.bytes);
 
-          String authMessage =
-              "$_clientFirstMessage,$authString,$clientFinalMessageWithoutProof";
+          var authMessage =
+              '$_clientFirstMessage,$authString,$clientFinalMessageWithoutProof';
 
-          Digest clientSignature =
+          var clientSignature =
               Hmac(sha256, storedKey.bytes).convert(authMessage.codeUnits);
 
-          List<int> clientProof = _xOr(clientKey.bytes, clientSignature.bytes);
+          var clientProof = _xOr(clientKey.bytes, clientSignature.bytes);
 
-          Digest serverKey =
-              Hmac(sha256, saltedPassword).convert("Server Key".codeUnits);
+          var serverKey =
+              Hmac(sha256, saltedPassword).convert('Server Key'.codeUnits);
 
           _serverSignature =
               Hmac(sha256, serverKey.bytes).convert(authMessage.codeUnits);
 
-          String message = json.encode({
+          var message = json.encode({
             'authentication': clientFinalMessageWithoutProof +
-                ",p=" +
+                ',p=' +
                 base64.encode(clientProof)
           });
 
-          List<int> messageBytes = List.from(message.codeUnits)..add(0);
+          var messageBytes = List<int>.from(message.codeUnits)..add(0);
 
-          _socket.add(messageBytes);
+          _socket!.add(messageBytes);
         } else if (authMap.containsKey('v')) {
           if (base64.encode(_serverSignature.bytes) != authMap['v']) {
-            _handleAuthError(RqlDriverError("Invalid server signature"));
+            _handleAuthError(RqlDriverError('Invalid server signature'));
           } else {
             _completer.complete(this);
           }
@@ -243,7 +242,7 @@ class Connection {
   _handleQueryResponse(Response response) {
     Query query = _replyQueries.remove(response._token);
 
-    Exception hasError = _checkErrorResponse(response, query._term);
+    Exception? hasError = _checkErrorResponse(response, query._term);
     if (hasError != null) {
       query._queryCompleter.completeError(hasError);
     }
@@ -252,22 +251,18 @@ class Connection {
     if (response._type == p.Response_ResponseType.SUCCESS_PARTIAL.value) {
       _replyQueries[response._token] = query;
       var cursor;
-      response._notes.forEach((note) {
+      response._notes!.forEach((note) {
         if (note == p.Response_ResponseNote.SEQUENCE_FEED.value) {
-          cursor = cursor == null ? Feed(this, query, query.optargs) : cursor;
+          cursor = cursor ?? Feed(this, query, query.optargs);
         } else if (note == p.Response_ResponseNote.UNIONED_FEED.value) {
-          cursor =
-              cursor == null ? UnionedFeed(this, query, query.optargs) : cursor;
+          cursor = cursor ?? UnionedFeed(this, query, query.optargs);
         } else if (note == p.Response_ResponseNote.ATOM_FEED.value) {
-          cursor =
-              cursor == null ? AtomFeed(this, query, query.optargs) : cursor;
+          cursor = cursor ?? AtomFeed(this, query, query.optargs);
         } else if (note == p.Response_ResponseNote.ORDER_BY_LIMIT_FEED.value) {
-          cursor = cursor == null
-              ? OrderByLimitFeed(this, query, query.optargs)
-              : cursor;
+          cursor = cursor ?? OrderByLimitFeed(this, query, query.optargs);
         }
       });
-      cursor = cursor == null ? Cursor(this, query, query.optargs) : cursor;
+      cursor = cursor ?? Cursor(this, query, query.optargs);
 
       value = cursor;
       query._cursor = value;
@@ -290,12 +285,12 @@ class Connection {
     } else {
       if (!query._queryCompleter.isCompleted) {
         query._queryCompleter
-            .completeError(RqlDriverError("Error: ${response._data}."));
+            .completeError(RqlDriverError('Error: ${response._data}.'));
       }
     }
 
     if (response._profile != null) {
-      value = {"value": value, "profile": response._profile};
+      value = {'value': value, 'profile': response._profile};
     }
     if (!query._queryCompleter.isCompleted) {
       query._queryCompleter.complete(value);
@@ -306,12 +301,12 @@ class Connection {
     if (_socket != null) {
       if (noreplyWait) this.noreplyWait();
       try {
-        _socket.close();
+        _socket!.close();
       } catch (err) {
         // TODO: do something with err.
       }
 
-      _socket.destroy();
+      _socket!.destroy();
       _socket = null;
     }
   }
@@ -323,9 +318,9 @@ class Connection {
 
   /// Adds a listener to the connection.
   void addListener(String key, Function val) {
-    List currentListeners = [];
+    var currentListeners = [];
     if (_listeners != null && _listeners[key] != null) {
-      _listeners[key].forEach((element) => currentListeners.add(element));
+      _listeners[key]!.forEach((element) => currentListeners.add(element));
     }
 
     currentListeners.add(val);
@@ -337,18 +332,18 @@ class Connection {
   }
 
   clientPort() {
-    return _socket.port;
+    return _socket!.port;
   }
 
   clientAddress() {
-    return _socket.address.address;
+    return _socket!.address.address;
   }
 
   noreplyWait() {
     RqlQuery query =
         Query(p.Query_QueryType.NOREPLY_WAIT, _getToken(), null, null);
 
-    _sendQueue.add(query);
+    _sendQueue.add(query as Query);
     return _start(query);
   }
 
@@ -382,7 +377,7 @@ class Connection {
         _responseBuffer.removeRange(0, responseLen + 12);
         _responseLength = _responseBuffer.length;
 
-        Response response = Response(responseToken, responseBuf);
+        var response = Response(responseToken, responseBuf);
 
         if (_replyQueries[response._token]._cursor != null) {
           _handleCursorResponse(response);
@@ -392,7 +387,7 @@ class Connection {
         if (_replyQueries.containsKey(response._token)) {
           _handleQueryResponse(response);
         } else {
-          throw RqlDriverError("Unexpected response received.");
+          throw RqlDriverError('Unexpected response received.');
         }
 
         if (_responseLength > 0) {
@@ -402,13 +397,13 @@ class Connection {
     }
   }
 
-  _checkErrorResponse(Response response, RqlQuery term) {
+  _checkErrorResponse(Response response, RqlQuery? term) {
     var message;
     var frames;
     if (response._type == p.Response_ResponseType.RUNTIME_ERROR.value) {
       message = response._data.first;
       frames = response._backtrace;
-      int errType = response._errorType;
+      var errType = response._errorType;
       if (errType == p.Response_ErrorType.INTERNAL.value) {
         return ReqlInternalError(message, term, frames);
       } else if (errType == p.Response_ErrorType.RESOURCE_LIMIT.value) {
@@ -442,19 +437,19 @@ class Connection {
 
   _sendQuery() {
     if (_sendQueue.isNotEmpty) {
-      Query query = _sendQueue.removeFirst();
+      var query = _sendQueue.removeFirst();
 
       // Error if this connection has closed
       if (_socket == null) {
         query._queryCompleter
-            .completeError(RqlDriverError("Connection is closed."));
+            .completeError(RqlDriverError('Connection is closed.'));
       } else {
         // Send json
-        List<int> queryStr = utf8.encode(query.serialize());
-        List<int> queryHeader = List.from(_toBytes8(query._token))
+        var queryStr = utf8.encode(query.serialize());
+        var queryHeader = List<int>.from(_toBytes8(query._token))
           ..addAll(_toBytes(queryStr.length))
           ..addAll(queryStr);
-        _socket.add(queryHeader);
+        _socket!.add(queryHeader);
 
         _replyQueries[query._token] = query;
         return query._queryCompleter.future;
@@ -462,7 +457,7 @@ class Connection {
     }
   }
 
-  _start(RqlQuery term, [Map globalOptargs]) {
+  _start(RqlQuery term, [Map? globalOptargs]) {
     globalOptargs ??= {};
     if (globalOptargs.containsKey('db')) {
       globalOptargs['db'] = DB(globalOptargs['db']);
@@ -470,45 +465,45 @@ class Connection {
       globalOptargs['db'] = DB(_db);
     }
 
-    Query query =
+    var query =
         Query(p.Query_QueryType.START, _getToken(), term, globalOptargs);
     _sendQueue.addLast(query);
     return _sendQuery();
   }
 
   Uint8List _toBytes(int data) {
-    ByteBuffer buffer = Uint8List(4).buffer;
-    ByteData bdata = ByteData.view(buffer);
+    var buffer = Uint8List(4).buffer;
+    var bdata = ByteData.view(buffer);
     bdata.setInt32(0, data, Endian.little);
     return Uint8List.view(buffer);
   }
 
   Uint8List _toBytes8(int data) {
-    ByteBuffer buffer = Uint8List(8).buffer;
-    ByteData bdata = ByteData.view(buffer);
+    var buffer = Uint8List(8).buffer;
+    var bdata = ByteData.view(buffer);
     bdata.setInt32(0, data, Endian.little);
     return Uint8List.view(buffer);
   }
 
   int _fromBytes(List<int> data) {
-    Uint8List buf = Uint8List.fromList(data);
-    ByteData bdata = ByteData.view(buf.buffer);
+    var buf = Uint8List.fromList(data);
+    var bdata = ByteData.view(buf.buffer);
     return bdata.getInt32(0, Endian.little);
   }
 
   String _makeSalt() {
-    List<int> randomBytes = List(18);
-    math.Random random = math.Random.secure();
+    var randomBytes = <int>[];
+    var random = math.Random.secure();
 
-    for (int i = 0; i < randomBytes.length; ++i) {
+    for (var i = 0; i < randomBytes.length; ++i) {
       randomBytes[i] = random.nextInt(255);
     }
 
-    return base64.encode(randomBytes);
+    return base64.encode(randomBytes as List<int>);
   }
 
   List<int> _xOr(List<int> result, List<int> next) {
-    for (int i = 0; i < result.length; i++) {
+    for (var i = 0; i < result.length; i++) {
       result[i] ^= next[i];
     }
     return result;
diff --git a/pubspec.yaml b/pubspec.yaml
index 850677f..534c5a8 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -7,12 +7,12 @@ description: Dart 2 driver for RethinkDB v2.3.
 homepage: https://github.com/marceloneppel/rethinkdb
 documentation: https://github.com/marceloneppel/rethinkdb
 environment:
-  sdk: ">=2.3.0 <3.0.0"
+  sdk: '>=2.12.0 <3.0.0'
 dependencies:
-  protobuf: ^0.13.15
-  crypto: ^2.0.6
-  convert: ^2.1.1
-  pbkdf2_dart: ^2.1.0
+  protobuf: ^2.0.0
+  crypto: ^3.0.1
+  convert: ^3.0.1
+  pbkdf2ns: ^0.0.2
 dev_dependencies:
-  test: ^1.6.5
-  pedantic: ^1.8.0
+  test: ^1.17.12
+  pedantic: ^1.11.1
diff --git a/test/aggregation_test.dart b/test/aggregation_test.dart
index b51ec55..161b6d8 100644
--- a/test/aggregation_test.dart
+++ b/test/aggregation_test.dart
@@ -1,30 +1,32 @@
+import 'dart:async';
+
 import 'package:test/test.dart';
 import 'package:rethinkdb_dart/rethinkdb_dart.dart';
 
 main() {
   Rethinkdb r = Rethinkdb();
-  String databaseName;
-  String tableName;
-  String testDbName;
+  late String databaseName;
+  late String tableName;
+  late String testDbName;
   bool shouldDropTable = false;
-  Connection connection;
+  late Connection connection;
 
   setUp(() async {
     connection = await r.connect();
 
     if (testDbName == null) {
-      String useDb = await r.uuid().run(connection);
+      String useDb = await (r.uuid().run(connection) as FutureOr<String>);
       testDbName = 'unit_test_db' + useDb.replaceAll("-", "");
       await r.dbCreate(testDbName).run(connection);
     }
 
     if (databaseName == null) {
-      String dbName = await r.uuid().run(connection);
+      String dbName = await (r.uuid().run(connection) as FutureOr<String>);
       databaseName = "test_database_" + dbName.replaceAll("-", "");
     }
 
     if (tableName == null) {
-      String tblName = await r.uuid().run(connection);
+      String tblName = await (r.uuid().run(connection) as FutureOr<String>);
       tableName = "test_table_" + tblName.replaceAll("-", "");
     }
     connection.use(testDbName);
@@ -34,20 +36,20 @@ main() {
     if (shouldDropTable) {
       shouldDropTable = false;
       await r.tableDrop(tableName).run(connection);
-      await connection.close();
+      connection.close();
     } else {
-      await connection.close();
+      connection.close();
     }
   });
 
   group("count command -> ", () {
     test("should count an array", () async {
-      int count = await r.expr([1, 2, 3]).count().run(connection);
+      int? count = await r.expr([1, 2, 3]).count().run(connection);
       expect(count, equals(3));
     });
 
     test("should count an array with a filter", () async {
-      int count = await r.expr([2, 1, 2, 3, 2, 2]).count(2).run(connection);
+      int? count = await r.expr([2, 1, 2, 3, 2, 2]).count(2).run(connection);
       expect(count, equals(4));
     });
 
@@ -61,7 +63,7 @@ main() {
         {"id": 5}
       ];
       await r.table(tableName).insert(testData).run(connection);
-      int count = await r.table(tableName).count().run(connection);
+      int count = await (r.table(tableName).count().run(connection) as FutureOr<int>);
       expect(count, equals(5));
     });
 
@@ -74,18 +76,18 @@ main() {
         {"id": 10, "age": 34}
       ];
       await r.table(tableName).insert(testData).run(connection);
-      int count = await r.table(tableName)('age').count(21).run(connection);
+      int? count = await r.table(tableName)('age').count(21).run(connection);
       expect(count, equals(2));
 
-      count = await r.table(tableName).count((user) {
+      count = await (r.table(tableName).count((user) {
         return user('id').lt(8);
-      }).run(connection);
+      }).run(connection) as FutureOr<int?>);
 
       expect(count, equals(7));
     });
 
     test("remove the test database", () async {
-      Map response = await r.dbDrop(testDbName).run(connection);
+      Map response = await (r.dbDrop(testDbName).run(connection) as FutureOr<Map<dynamic, dynamic>>);
 
       expect(response.containsKey('config_changes'), equals(true));
       expect(response['dbs_dropped'], equals(1));
diff --git a/test/comparison_operators_test.dart b/test/comparison_operators_test.dart
index a1a6053..03f8ab3 100644
--- a/test/comparison_operators_test.dart
+++ b/test/comparison_operators_test.dart
@@ -1,23 +1,25 @@
+import 'dart:async';
+
 import 'package:test/test.dart';
 import 'package:rethinkdb_dart/rethinkdb_dart.dart';
 
 main() {
   Rethinkdb r = Rethinkdb();
-  String tableName;
-  String testDbName;
+  late String tableName;
+  late String testDbName;
   bool shouldDropTable = false;
-  Connection connection;
+  late Connection connection;
 
   setUp(() async {
     connection = await r.connect();
     if (testDbName == null) {
-      String useDb = await r.uuid().run(connection);
+      String useDb = await (r.uuid().run(connection) as FutureOr<String>);
       testDbName = 'unit_test_db' + useDb.replaceAll("-", "");
       await r.dbCreate(testDbName).run(connection);
     }
     connection.use(testDbName);
     if (tableName == null) {
-      String tblName = await r.uuid().run(connection);
+      String tblName = await (r.uuid().run(connection) as FutureOr<String>);
       tableName = "test_table_" + tblName.replaceAll("-", "");
       await r.tableCreate(tableName).run(connection);
     }
diff --git a/test/connection_test.dart b/test/connection_test.dart
index efabf9c..138edf0 100644
--- a/test/connection_test.dart
+++ b/test/connection_test.dart
@@ -52,7 +52,7 @@ main() {
 
   test("connections should return server info", () async {
     Connection conn = await r.connect();
-    Map m = await conn.server();
+    Map m = await (conn.server() as FutureOr<Map<dynamic, dynamic>>);
 
     expect(m.keys.length, equals(3));
     expect(m.containsKey('id'), equals(true));
diff --git a/test/data_test.dart b/test/data_test.dart
index 63b72a0..aadf454 100644
--- a/test/data_test.dart
+++ b/test/data_test.dart
@@ -4,10 +4,10 @@ import 'dart:async';
 
 main() {
   Rethinkdb r = Rethinkdb();
-  String tableName;
-  String testDbName;
+  late String tableName;
+  late String testDbName;
   bool shouldDropTable = false;
-  Connection connection;
+  late Connection connection;
 
   _setUpTable() async {
     return await r.table(tableName).insert([
@@ -34,13 +34,13 @@ main() {
   setUp(() async {
     connection = await r.connect();
     if (testDbName == null) {
-      String useDb = await r.uuid().run(connection);
+      String useDb = await (r.uuid().run(connection) as FutureOr<String>);
       testDbName = 'unit_test_db' + useDb.replaceAll("-", "");
       await r.dbCreate(testDbName).run(connection);
     }
     connection.use(testDbName);
     if (tableName == null) {
-      String tblName = await r.uuid().run(connection);
+      String tblName = await (r.uuid().run(connection) as FutureOr<String>);
       tableName = "test_table_" + tblName.replaceAll("-", "");
       await r.tableCreate(tableName).run(connection);
     }
@@ -187,7 +187,7 @@ main() {
   group("changes command -> ", () {
     test("should return the changes from the person that is updated", () async {
       Feed feed =
-          await r.table(tableName).changes().run(connection).asStream().first;
+          await (r.table(tableName).changes().run(connection).asStream().first as FutureOr<Feed>);
       Timer(Duration(seconds: 1), () async {
         var result = await r
             .table(tableName)
diff --git a/test/geojson_test.dart b/test/geojson_test.dart
index 9bdec17..0f4568a 100644
--- a/test/geojson_test.dart
+++ b/test/geojson_test.dart
@@ -3,9 +3,9 @@ import 'package:rethinkdb_dart/rethinkdb_dart.dart';
 
 main() {
   var r = Rethinkdb() as dynamic;
-  String databaseName;
-  String tableName;
-  String testDbName;
+  late String databaseName;
+  late String tableName;
+  late String testDbName;
   bool shouldDropTable = false;
   var connection;
 
@@ -50,7 +50,7 @@ main() {
     });
 
     test("should create a polygon given a point and also a radius", () async {
-      Point p = r.point(long, lat);
+      Point? p = r.point(long, lat);
       Map response = await r.circle(p, rad).run(connection);
 
       expect(response.containsKey('coordinates'), equals(true));
@@ -60,7 +60,7 @@ main() {
 
     test("should create a polygon with a specified number of vertices",
         () async {
-      Point p = r.point(long, lat);
+      Point? p = r.point(long, lat);
 
       Map response =
           await r.circle(p, rad, {'num_vertices': 4}).run(connection);
@@ -73,7 +73,7 @@ main() {
 
     test("should create a polygon with a specified geo_system", () async {
       rad = 1;
-      Point p = r.point(long, lat);
+      Point? p = r.point(long, lat);
 
       Map response =
           await r.circle(p, rad, {'geo_system': 'unit_sphere'}).run(connection);
@@ -85,7 +85,7 @@ main() {
 
     test("should create a polygon with a specified unit", () async {
       rad = 1;
-      Point p = r.point(long, lat);
+      Point? p = r.point(long, lat);
 
       Map response = await r
           .circle(p, rad, {'num_vertices': 3, 'unit': 'nm'}).run(connection);
@@ -96,7 +96,7 @@ main() {
     });
 
     test("should create an unfilled line", () async {
-      Point p = r.point(long, lat);
+      Point? p = r.point(long, lat);
 
       Map response = await r
           .circle(p, rad, {'num_vertices': 4, 'fill': false}).run(connection);
@@ -108,24 +108,24 @@ main() {
   });
 
   group("distance command -> ", () {
-    Circle c = r.circle([-90, 0], 1);
-    Point p = r.point(0, -90);
+    Circle? c = r.circle([-90, 0], 1);
+    Point? p = r.point(0, -90);
 
     test("should compute the distance between a point and a polygon", () async {
-      num distance = await r.distance(p, c).run(connection);
+      num? distance = await r.distance(p, c).run(connection);
 
       expect(distance, equals(10001964.729312724));
     });
 
     test("should compute the distance for a given geo_system", () async {
-      num distance =
+      num? distance =
           await r.distance(p, c, {'geo_system': 'unit_sphere'}).run(connection);
 
       expect(distance, equals(1.5707961689526464));
     });
 
     test("should compute the distance for a given unit", () async {
-      num distance = await r.distance(
+      num? distance = await r.distance(
           p, c, {'geo_system': 'unit_sphere', 'unit': 'ft'}).run(connection);
       expect(distance, equals(5.153530738033616));
     });
@@ -154,9 +154,9 @@ main() {
   group("includes command -> ", () {
     test("should return true if a geometry includes some other geometry",
         () async {
-      Point point1 = r.point(-117.220406, 32.719464);
-      Point point2 = r.point(-117.206201, 32.725186);
-      bool doesInclude =
+      Point? point1 = r.point(-117.220406, 32.719464);
+      Point? point2 = r.point(-117.206201, 32.725186);
+      bool? doesInclude =
           await r.circle(point1, 2000).includes(point2).run(connection);
 
       expect(doesInclude, equals(true));
@@ -165,9 +165,9 @@ main() {
     test(
         "should return false if a geometry does not include some other geometry",
         () async {
-      Point point1 = r.point(-0, 0);
-      Point point2 = r.point(-100, 90);
-      bool doesInclude =
+      Point? point1 = r.point(-0, 0);
+      Point? point2 = r.point(-100, 90);
+      bool? doesInclude =
           await r.circle(point1, 1).includes(point2).run(connection);
 
       expect(doesInclude, equals(false));
@@ -176,11 +176,11 @@ main() {
     test(
         "should filter a sequence to only contain items that include some other geometry",
         () async {
-      Point point1 = r.point(-0, 0);
-      Point point2 = r.point(-1, 1);
-      Point point3 = r.point(-99, 90);
-      Point point4 = r.point(101, 90);
-      Point point5 = r.point(-100, 90);
+      Point? point1 = r.point(-0, 0);
+      Point? point2 = r.point(-1, 1);
+      Point? point3 = r.point(-99, 90);
+      Point? point4 = r.point(101, 90);
+      Point? point5 = r.point(-100, 90);
       List included = await r
           .expr([
             r.circle(point1, 2),
@@ -198,9 +198,9 @@ main() {
   group("intersects command -> ", () {
     test("should return true if a geometry intersects some other geometry",
         () async {
-      Point point1 = r.point(-117.220406, 32.719464);
-      Line line = r.line(r.point(-117.206201, 32.725186), r.point(0, 1));
-      bool doesIntersect =
+      Point? point1 = r.point(-117.220406, 32.719464);
+      Line? line = r.line(r.point(-117.206201, 32.725186), r.point(0, 1));
+      bool? doesIntersect =
           await r.circle(point1, 2000).intersects(line).run(connection);
 
       expect(doesIntersect, equals(true));
@@ -209,9 +209,9 @@ main() {
     test(
         "should return false if a geometry does not intersect some other geometry",
         () async {
-      Point point1 = r.point(-117.220406, 32.719464);
-      Line line = r.line(r.point(20, 20), r.point(0, 1));
-      bool doesIntersect =
+      Point? point1 = r.point(-117.220406, 32.719464);
+      Line? line = r.line(r.point(20, 20), r.point(0, 1));
+      bool? doesIntersect =
           await r.circle(point1, 1).intersects(line).run(connection);
 
       expect(doesIntersect, equals(false));
@@ -225,7 +225,7 @@ main() {
       var point3 = r.point(-17, 3);
       var point4 = r.point(20, 20);
       var point5 = r.point(-100, 90);
-      Line line = r.line(point1, point2);
+      Line? line = r.line(point1, point2);
       List intersecting = await r
           .expr([point1, point2, point3, point4, point5])
           .intersects(line)
@@ -358,11 +358,11 @@ main() {
       expect(poly['type'], equals('Polygon'));
     });
 
-    Point point1 = r.point(0, 0);
-    Point point2 = r.point(40, 0);
-    Point point3 = r.point(40, 40);
-    Point point4 = r.point(20, 50);
-    Point point5 = r.point(0, 40);
+    Point? point1 = r.point(0, 0);
+    Point? point2 = r.point(40, 0);
+    Point? point3 = r.point(40, 40);
+    Point? point4 = r.point(20, 50);
+    Point? point5 = r.point(0, 40);
     test("should create a polygon given three points", () async {
       Map poly = await r.polygon(point1, point2, point3).run(connection);
 
diff --git a/test/numeric_operators_test.dart b/test/numeric_operators_test.dart
index 853120d..09e7a76 100644
--- a/test/numeric_operators_test.dart
+++ b/test/numeric_operators_test.dart
@@ -1,23 +1,25 @@
+import 'dart:async';
+
 import 'package:test/test.dart';
 import 'package:rethinkdb_dart/rethinkdb_dart.dart';
 
 main() {
   Rethinkdb r = Rethinkdb();
-  String tableName;
-  String testDbName;
+  late String tableName;
+  late String testDbName;
   bool shouldDropTable = false;
-  Connection connection;
+  late Connection connection;
 
   setUp(() async {
     connection = await r.connect();
     if (testDbName == null) {
-      String useDb = await r.uuid().run(connection);
+      String useDb = await (r.uuid().run(connection) as FutureOr<String>);
       testDbName = 'unit_test_db' + useDb.replaceAll("-", "");
       await r.dbCreate(testDbName).run(connection);
     }
     connection.use(testDbName);
     if (tableName == null) {
-      String tblName = await r.uuid().run(connection);
+      String tblName = await (r.uuid().run(connection) as FutureOr<String>);
       tableName = "test_table_" + tblName.replaceAll("-", "");
       await r.tableCreate(tableName).run(connection);
     }
diff --git a/test/parallel_execution_test.dart b/test/parallel_execution_test.dart
index 87ca4a2..1e91b3b 100644
--- a/test/parallel_execution_test.dart
+++ b/test/parallel_execution_test.dart
@@ -4,12 +4,12 @@ import 'package:rethinkdb_dart/rethinkdb_dart.dart';
 
 main() {
   test('ParallelExecution', () async {
-    bool isParallel = await pEx();
+    bool isParallel = await (pEx() as FutureOr<bool>);
     expect(isParallel, equals(true));
   }, timeout: Timeout.factor(4));
 }
 
-Future pEx() {
+Future? pEx() {
   var r = Rethinkdb() as dynamic;
   return r
       .connect(db: "test", port: 28015)
@@ -18,7 +18,7 @@ Future pEx() {
 
 _queryWhileWriting(conn, r) async {
   //variable that will be set by our faster query
-  int total;
+  int? total;
 
   Completer testCompleter = Completer();
 
diff --git a/test/polymorphic_object_sequence_operations_test.dart b/test/polymorphic_object_sequence_operations_test.dart
index 2ad034f..52ff3d1 100644
--- a/test/polymorphic_object_sequence_operations_test.dart
+++ b/test/polymorphic_object_sequence_operations_test.dart
@@ -1,12 +1,14 @@
+import 'dart:async';
+
 import 'package:test/test.dart';
 import 'package:rethinkdb_dart/rethinkdb_dart.dart';
 
 main() {
   Rethinkdb r = Rethinkdb();
-  String tableName;
-  String testDbName;
+  late String tableName;
+  late String testDbName;
   bool shouldDropTable = false;
-  Connection connection;
+  late Connection connection;
 
   _setUpTable() async {
     return await r.table(tableName).insert([
@@ -33,13 +35,13 @@ main() {
   setUp(() async {
     connection = await r.connect();
     if (testDbName == null) {
-      String useDb = await r.uuid().run(connection);
+      String useDb = await (r.uuid().run(connection) as FutureOr<String>);
       testDbName = 'unit_test_db' + useDb.replaceAll("-", "");
       await r.dbCreate(testDbName).run(connection);
     }
     connection.use(testDbName);
     if (tableName == null) {
-      String tblName = await r.uuid().run(connection);
+      String tblName = await (r.uuid().run(connection) as FutureOr<String>);
       tableName = "test_table_" + tblName.replaceAll("-", "");
       await r.tableCreate(tableName).run(connection);
     }
diff --git a/test/rql_type_inspection_test.dart b/test/rql_type_inspection_test.dart
index 8cf6143..e411b8c 100644
--- a/test/rql_type_inspection_test.dart
+++ b/test/rql_type_inspection_test.dart
@@ -1,12 +1,14 @@
+import 'dart:async';
+
 import 'package:test/test.dart';
 import 'package:rethinkdb_dart/rethinkdb_dart.dart';
 
 main() {
   Rethinkdb r = Rethinkdb();
-  String tableName;
-  String testDbName;
+  late String tableName;
+  late String testDbName;
   bool shouldDropTable = false;
-  Connection connection;
+  late Connection connection;
 
   _setUpTable() async {
     return await r.table(tableName).insert([
@@ -33,13 +35,13 @@ main() {
   setUp(() async {
     connection = await r.connect();
     if (testDbName == null) {
-      String useDb = await r.uuid().run(connection);
+      String useDb = await (r.uuid().run(connection) as FutureOr<String>);
       testDbName = 'unit_test_db' + useDb.replaceAll("-", "");
       await r.dbCreate(testDbName).run(connection);
     }
     connection.use(testDbName);
     if (tableName == null) {
-      String tblName = await r.uuid().run(connection);
+      String tblName = await (r.uuid().run(connection) as FutureOr<String>);
       tableName = "test_table_" + tblName.replaceAll("-", "");
       await r.tableCreate(tableName).run(connection);
     }
diff --git a/test/selectingdata_test.dart b/test/selectingdata_test.dart
index 5eed14c..bf30263 100644
--- a/test/selectingdata_test.dart
+++ b/test/selectingdata_test.dart
@@ -4,10 +4,10 @@ import 'package:rethinkdb_dart/rethinkdb_dart.dart';
 main() {
   var r = Rethinkdb() as dynamic;
 
-  String tableName;
-  String testDbName;
+  late String tableName;
+  late String testDbName;
   bool shouldDropTable = false;
-  Connection connection;
+  Connection? connection;
 
   setUp(() async {
     connection = await r.connect();
@@ -17,7 +17,7 @@ main() {
       testDbName = 'unit_test_db' + useDb.replaceAll("-", "");
       await r.dbCreate(testDbName).run(connection);
     }
-    connection.use(testDbName);
+    connection!.use(testDbName);
 
     if (tableName == null) {
       String tblName = await r.uuid().run(connection);
@@ -30,9 +30,9 @@ main() {
     if (shouldDropTable) {
       shouldDropTable = false;
       await r.tableDrop(tableName).run(connection);
-      connection.close();
+      connection!.close();
     } else {
-      connection.close();
+      connection!.close();
     }
   });
 
diff --git a/test/tablemethods_test.dart b/test/tablemethods_test.dart
index e0f167d..a2048e8 100644
--- a/test/tablemethods_test.dart
+++ b/test/tablemethods_test.dart
@@ -3,11 +3,11 @@ import 'package:rethinkdb_dart/rethinkdb_dart.dart';
 
 main() {
   var r = Rethinkdb() as dynamic;
-  String databaseName;
-  String tableName;
-  String testDbName;
+  late String databaseName;
+  late String tableName;
+  late String testDbName;
   bool shouldDropTable = false;
-  Connection connection;
+  Connection? connection;
 
   setUp(() async {
     connection = await r.connect();
@@ -27,16 +27,16 @@ main() {
       String tblName = await r.uuid().run(connection);
       tableName = "test_table_" + tblName.replaceAll("-", "");
     }
-    connection.use(testDbName);
+    connection!.use(testDbName);
   });
 
   tearDown(() async {
     if (shouldDropTable) {
       shouldDropTable = false;
       await r.tableDrop(tableName).run(connection);
-      connection.close();
+      connection!.close();
     } else {
-      connection.close();
+      connection!.close();
     }
   });
 
diff --git a/test/toplevelqueries_test.dart b/test/toplevelqueries_test.dart
index 4230a0f..e398aa7 100644
--- a/test/toplevelqueries_test.dart
+++ b/test/toplevelqueries_test.dart
@@ -3,11 +3,11 @@ import 'package:rethinkdb_dart/rethinkdb_dart.dart';
 
 main() {
   var r = Rethinkdb() as dynamic;
-  String databaseName;
-  String tableName;
-  String testDbName;
+  late String databaseName;
+  late String tableName;
+  late String testDbName;
   bool shouldDropTable = false;
-  Connection connection;
+  Connection? connection;
 
   setUp(() async {
     connection = await r.connect();
@@ -27,7 +27,7 @@ main() {
       String tblName = await r.uuid().run(connection);
       tableName = "test_table_" + tblName.replaceAll("-", "");
     }
-    connection.use(testDbName);
+    connection!.use(testDbName);
   });
 
   tearDown(() async {
@@ -35,7 +35,7 @@ main() {
       shouldDropTable = false;
       await r.tableDrop(tableName).run(connection);
     }
-    connection.close();
+    connection!.close();
   });
 
   test("r.db throws an error if a bad database name is given", () async {
@@ -43,7 +43,7 @@ main() {
       await r.db('fake2834723895').tableList().run(connection);
     } catch (err) {
       expect(err is Exception, equals(true));
-      expect(err.message, equals('Database `fake2834723895` does not exist.'));
+      expect(err.toString().split("\n")[2], equals('Database `fake2834723895` does not exist.'));
     }
   });
 
@@ -70,7 +70,7 @@ main() {
       } catch (err) {
         expect(err is Exception, equals(true));
         expect(
-            err.message, equals('Database `${databaseName}` already exists.'));
+            err.toString().split("\n")[2], equals('Database `${databaseName}` already exists.'));
       }
     });
   });
@@ -98,7 +98,7 @@ main() {
         await r.dbDrop(databaseName).run(connection);
       } catch (err) {
         expect(
-            err.message, equals('Database `${databaseName}` does not exist.'));
+            err.toString().split("\n")[2], equals('Database `${databaseName}` does not exist.'));
       }
     });
   });
@@ -138,7 +138,7 @@ main() {
     test("table should return a cursor containing all records for a table",
         () async {
       Cursor cur = await r.db('rethinkdb').table('stats').run(connection);
-      await for (Map item in cur) {
+      await for (Map item in cur as Stream<Map<dynamic, dynamic>>) {
         expect(item.containsKey('id'), equals(true));
         expect(item.containsKey('query_engine'), equals(true));
       }
@@ -149,7 +149,7 @@ main() {
           .db('rethinkdb')
           .table('stats', {'read_mode': 'single'}).run(connection);
 
-      await for (Map item in cur) {
+      await for (Map item in cur as Stream<Map<dynamic, dynamic>>) {
         expect(item.containsKey('id'), equals(true));
         expect(item.containsKey('query_engine'), equals(true));
       }
@@ -161,7 +161,7 @@ main() {
           .db('rethinkdb')
           .table('stats', {'read_mode': 'majority'}).run(connection);
 
-      await for (Map item in cur) {
+      await for (Map item in cur as Stream<Map<dynamic, dynamic>>) {
         expect(item.containsKey('id'), equals(true));
         expect(item.containsKey('query_engine'), equals(true));
       }
@@ -173,7 +173,7 @@ main() {
           .db('rethinkdb')
           .table('stats', {'read_mode': 'outdated'}).run(connection);
 
-      await for (Map item in cur) {
+      await for (Map item in cur as Stream<Map<dynamic, dynamic>>) {
         expect(item.containsKey('id'), equals(true));
         expect(item.containsKey('query_engine'), equals(true));
       }
@@ -187,7 +187,7 @@ main() {
             .table('stats', {'read_mode': 'badReadMode'}).run(connection);
       } catch (err) {
         expect(
-            err.message,
+            err.toString().split("\n")[2],
             equals(
                 'Read mode `badReadMode` unrecognized (options are "majority", "single", and "outdated").'));
       }
@@ -199,7 +199,7 @@ main() {
           .db('rethinkdb')
           .table('stats', {'identifier_format': 'name'}).run(connection);
 
-      await for (Map item in cur) {
+      await for (Map item in cur as Stream<Map<dynamic, dynamic>>) {
         expect(item.containsKey('id'), equals(true));
         expect(item.containsKey('query_engine'), equals(true));
       }
@@ -211,7 +211,7 @@ main() {
           .db('rethinkdb')
           .table('stats', {'identifier_format': 'uuid'}).run(connection);
 
-      await for (Map item in cur) {
+      await for (Map item in cur as Stream<Map<dynamic, dynamic>>) {
         expect(item.containsKey('id'), equals(true));
         expect(item.containsKey('query_engine'), equals(true));
       }
@@ -225,7 +225,7 @@ main() {
             .table('stats', {'identifier_format': 'badFormat'}).run(connection);
       } catch (err) {
         expect(
-            err.message,
+            err.toString().split("\n")[2],
             equals(
                 'Identifier format `badFormat` unrecognized (options are "name" and "uuid").'));
       }
@@ -237,7 +237,7 @@ main() {
             .db('rethinkdb')
             .table('stats', {'fake_option': 'bad_value'}).run(connection);
       } catch (err) {
-        expect(err.message,
+        expect(err.toString().split("\n")[2],
             equals('Unrecognized optional argument `fake_option`.'));
       }
       ;
@@ -329,13 +329,13 @@ main() {
 
   group("rqlDo command -> ", () {
     test("should accept a single argument and function", () async {
-      bool i = await r.rqlDo(3, (item) => item > 4).run(connection);
+      bool? i = await r.rqlDo(3, (item) => item > 4).run(connection);
 
       expect(i, equals(false));
     });
 
     test("should accept a many arguments and a function", () async {
-      num i = await r
+      num? i = await r
           .rqlDo(
               3,
               4,
@@ -360,20 +360,20 @@ main() {
   group("branch command -> ", () {
     test("should accept a true test and return the true branch value",
         () async {
-      String val = await r.branch(3 < 4, 'isTrue', 'isFalse').run(connection);
+      String? val = await r.branch(3 < 4, 'isTrue', 'isFalse').run(connection);
 
       expect(val, equals('isTrue'));
     });
 
     test("should accept a false test and return the false branch value",
         () async {
-      String val = await r.branch(3 > 4, 'isTrue', 'isFalse').run(connection);
+      String? val = await r.branch(3 > 4, 'isTrue', 'isFalse').run(connection);
 
       expect(val, equals('isFalse'));
     });
 
     test("should accept multiple tests and actions", () async {
-      String val = await r
+      String? val = await r
           .branch(1 > 4, 'isTrue', 0 < 1, 'elseTrue', 'isFalse')
           .run(connection);
 
@@ -386,7 +386,7 @@ main() {
       await r.error('This is my Error').run(connection);
     } catch (err) {
       expect(err.runtimeType, equals(ReqlUserError));
-      expect(err.message, equals('This is my Error'));
+      expect(err.toString().split("\n")[2], equals('This is my Error'));
     }
   });
 
@@ -399,7 +399,7 @@ main() {
         concatStrs();
         """;
 
-      String str = await r.js(jsString).run(connection);
+      String? str = await r.js(jsString).run(connection);
 
       expect(str, equals('firstHalf_secondHalf'));
     });
@@ -418,7 +418,7 @@ main() {
         await r.js(jsString, {'timeout': timeout}).run(connection);
       } catch (err) {
         expect(
-            err.message,
+            err.toString().split("\n")[2],
             equals(
                 'JavaScript query `${jsString}` timed out after ${timeout}.000 seconds.'));
       }
@@ -428,7 +428,7 @@ main() {
   group("json command -> ", () {
     test("should parse a json string", () async {
       String jsonString = "[1,2,3,4]";
-      List obj = await r.json(jsonString).run(connection);
+      List? obj = await r.json(jsonString).run(connection);
 
       expect([1, 2, 3, 4], equals(obj));
     });
@@ -439,7 +439,7 @@ main() {
         await r.json(jsonString).run(connection);
       } catch (err) {
         expect(
-            err.message,
+            err.toString().split("\n")[2],
             equals(
                 'Failed to parse "$jsonString" as JSON: The document root must not follow by other values.'));
       }
@@ -467,7 +467,7 @@ main() {
             .run(connection);
       } catch (err) {
         expect(
-            err.message,
+            err.toString().split("\n")[2],
             equals(
                 'OBJECT expects an even number of arguments (but found 7).'));
       }
@@ -475,7 +475,7 @@ main() {
   });
 
   test("args command -> should accept an array", () async {
-    List l = await r.args([1, 2]).run(connection);
+    List? l = await r.args([1, 2]).run(connection);
 
     expect(l, equals([1, 2]));
   });
@@ -483,7 +483,7 @@ main() {
   group("random command -> ", () {
     test("should generate a random number if no parameters are provided",
         () async {
-      double number = await r.random().run(connection);
+      double? number = await r.random().run(connection);
 
       expect(number is double, equals(true));
       expect(number, lessThanOrEqualTo(1));
@@ -493,7 +493,7 @@ main() {
     test(
         "should generate a positive random int no greater than the single argument",
         () async {
-      int number = await r.random(50).run(connection);
+      int? number = await r.random(50).run(connection);
 
       expect(number is int, equals(true));
       expect(number, lessThanOrEqualTo(50));
@@ -501,7 +501,7 @@ main() {
     });
 
     test("should generate a random int between the two arguments", () async {
-      int number = await r.random(50, 55).run(connection);
+      int? number = await r.random(50, 55).run(connection);
 
       expect(number is int, equals(true));
       expect(number, lessThanOrEqualTo(55));
@@ -509,7 +509,7 @@ main() {
     });
 
     test("should generate a random float between the two arguments", () async {
-      double number = await r.random(50, 55, {'float': true}).run(connection);
+      double? number = await r.random(50, 55, {'float': true}).run(connection);
       expect(number is double, equals(true));
       expect(number, lessThanOrEqualTo(55));
       expect(number, greaterThanOrEqualTo(50));
@@ -518,13 +518,13 @@ main() {
 
   group("not command -> ", () {
     test("should return false if given no arguements", () async {
-      bool val = await r.not().run(connection);
+      bool? val = await r.not().run(connection);
 
       expect(val, equals(false));
     });
 
     test("should return the inverse of the argument provided", () async {
-      bool val = await r.not(false).run(connection);
+      bool? val = await r.not(false).run(connection);
 
       expect(val, equals(true));
     });
@@ -532,13 +532,13 @@ main() {
 
   group("map command -> ", () {
     test("should map over an array", () async {
-      List arr =
+      List? arr =
           await r.map([1, 2, 3, 4, 5], (item) => item * 2).run(connection);
       expect(arr, equals([2, 4, 6, 8, 10]));
     });
 
     test("should map over multiple arrays", () async {
-      List arr = await r.map([1, 2, 3, 4, 5], [10, 9, 8, 7],
+      List? arr = await r.map([1, 2, 3, 4, 5], [10, 9, 8, 7],
           (item, item2) => item + item2).run(connection);
 
       //notice that the first array is longer but we
@@ -547,7 +547,7 @@ main() {
     });
 
     test("should map a sequence", () async {
-      List arr = await r
+      List? arr = await r
           .map(
               r.expr({
                 'key': [1, 2, 3, 4, 5]
@@ -559,7 +559,7 @@ main() {
     });
 
     test("should map over multiple sequences", () async {
-      List arr = await r
+      List? arr = await r
           .map(
               r.expr({
                 'key': [1, 2, 3, 4, 5]
@@ -576,12 +576,12 @@ main() {
 
   group("and command -> ", () {
     test("should and two values together", () async {
-      bool val = await r.and(true, true).run(connection);
+      bool? val = await r.and(true, true).run(connection);
 
       expect(val, equals(true));
     });
     test("should and more than two values together", () async {
-      bool val = await r.and(true, true, false).run(connection);
+      bool? val = await r.and(true, true, false).run(connection);
 
       expect(val, equals(false));
     });
@@ -589,13 +589,13 @@ main() {
 
   group("or command -> ", () {
     test("should or two values together", () async {
-      bool val = await r.or(true, false).run(connection);
+      bool? val = await r.or(true, false).run(connection);
 
       expect(val, equals(true));
     });
 
     test("should and more than two values together", () async {
-      bool val = await r.or(false, false, false).run(connection);
+      bool? val = await r.or(false, false, false).run(connection);
 
       expect(val, equals(false));
     });
@@ -603,7 +603,7 @@ main() {
 
   group("binary command -> ", () {
     test("should convert string to binary", () async {
-      List data = await r.binary('billysometimes').run(connection);
+      List? data = await r.binary('billysometimes').run(connection);
 
       expect(data is List, equals(true));
       expect(
@@ -629,14 +629,14 @@ main() {
 
   group("uuid command -> ", () {
     test("should create a unique uuid", () async {
-      String val = await r.uuid().run(connection);
+      String? val = await r.uuid().run(connection);
 
       expect(val is String, equals(true));
     });
 
     test("should create a uuid based on a string key", () async {
       String key = "billysometimes";
-      String val = await r.uuid(key).run(connection);
+      String? val = await r.uuid(key).run(connection);
 
       expect(val is String, equals(true));
       expect(val, equals('b3f5029e-f777-572f-a85d-5529b74fd99b'));
@@ -645,28 +645,28 @@ main() {
 
   group("expr command -> ", () {
     test("expr should convert native string to rql string", () async {
-      String str = await r.expr('string').run(connection);
+      String? str = await r.expr('string').run(connection);
       expect(str, equals('string'));
     });
 
     test("expr should convert native int to rql int", () async {
-      int str = await r.expr(3).run(connection);
+      int? str = await r.expr(3).run(connection);
       expect(str, equals(3));
     });
     test("expr should convert native double to rql float", () async {
-      double str = await r.expr(3.14).run(connection);
+      double? str = await r.expr(3.14).run(connection);
       expect(str, equals(3.14));
     });
     test("expr should convert native bool to rql bool", () async {
-      bool str = await r.expr(true).run(connection);
+      bool? str = await r.expr(true).run(connection);
       expect(str, equals(true));
     });
     test("expr should convert native list to rql array", () async {
-      List str = await r.expr([1, 2, 3]).run(connection);
+      List? str = await r.expr([1, 2, 3]).run(connection);
       expect(str, equals([1, 2, 3]));
     });
     test("expr should convert native object to rql object", () async {
-      Map str = await r.expr({'a': 'b'}).run(connection);
+      Map? str = await r.expr({'a': 'b'}).run(connection);
       expect(str, equals({'a': 'b'}));
     });
   });
diff --git a/test/writingdata_test.dart b/test/writingdata_test.dart
index 2bff968..41d91c9 100644
--- a/test/writingdata_test.dart
+++ b/test/writingdata_test.dart
@@ -1,25 +1,27 @@
+import 'dart:async';
+
 import 'package:test/test.dart';
 import 'package:rethinkdb_dart/rethinkdb_dart.dart';
 
 main() {
   Rethinkdb r = Rethinkdb();
-  String tableName;
-  String testDbName;
+  late String tableName;
+  late String testDbName;
   bool shouldDropTable = false;
-  Connection connection;
+  late Connection connection;
 
   setUp(() async {
     connection = await r.connect();
 
     if (testDbName == null) {
-      String useDb = await r.uuid().run(connection);
+      String useDb = await (r.uuid().run(connection) as FutureOr<String>);
       testDbName = 'unit_test_db' + useDb.replaceAll("-", "");
       await r.dbCreate(testDbName).run(connection);
     }
     connection.use(testDbName);
 
     if (tableName == null) {
-      String tblName = await r.uuid().run(connection);
+      String tblName = await (r.uuid().run(connection) as FutureOr<String>);
       tableName = "test_table_" + tblName.replaceAll("-", "");
       await r.tableCreate(tableName).run(connection);
     }
@@ -35,9 +37,9 @@ main() {
 
   group("insert command -> ", () {
     test("should insert a single record", () async {
-      Map createdRecord = await r
+      Map createdRecord = await (r
           .table(tableName)
-          .insert({'id': 1, 'name': 'Jane Doe'}).run(connection);
+          .insert({'id': 1, 'name': 'Jane Doe'}).run(connection) as FutureOr<Map<dynamic, dynamic>>);
 
       expect(createdRecord['deleted'], equals(0));
       expect(createdRecord['errors'], equals(0));
@@ -48,9 +50,9 @@ main() {
     });
 
     test("should error if record exists", () async {
-      Map createdRecord = await r
+      Map createdRecord = await (r
           .table(tableName)
-          .insert({'id': 1, 'name': 'Jane Doe'}).run(connection);
+          .insert({'id': 1, 'name': 'Jane Doe'}).run(connection) as FutureOr<Map<dynamic, dynamic>>);
 
       expect(
           createdRecord['first_error'].startsWith('Duplicate primary key `id`'),
@@ -63,7 +65,7 @@ main() {
       expect(createdRecord['unchanged'], equals(0));
     });
     test("should insert multiple records", () async {
-      Map createdRecord = await r.table(tableName).insert([
+      Map createdRecord = await (r.table(tableName).insert([
         {'name': 'Jane Doe'},
         {
           'id': 2,
@@ -73,7 +75,7 @@ main() {
             'drums': ['kick', 'tom']
           }
         }
-      ]).run(connection);
+      ]).run(connection) as FutureOr<Map<dynamic, dynamic>>);
 
       expect(createdRecord['deleted'], equals(0));
       expect(createdRecord['errors'], equals(0));
@@ -84,9 +86,9 @@ main() {
       expect(createdRecord['unchanged'], equals(0));
     });
     test("should change durability", () async {
-      Map createdRecord = await r
+      Map createdRecord = await (r
           .table(tableName)
-          .insert({'name': 'a'}, {'durability': 'hard'}).run(connection);
+          .insert({'name': 'a'}, {'durability': 'hard'}).run(connection) as FutureOr<Map<dynamic, dynamic>>);
 
       expect(createdRecord['deleted'], equals(0));
       expect(createdRecord['errors'], equals(0));
@@ -97,9 +99,9 @@ main() {
       expect(createdRecord['unchanged'], equals(0));
     });
     test("should allow return_changes", () async {
-      Map createdRecord = await r
+      Map createdRecord = await (r
           .table(tableName)
-          .insert({'name': 'a'}, {'return_changes': true}).run(connection);
+          .insert({'name': 'a'}, {'return_changes': true}).run(connection) as FutureOr<Map<dynamic, dynamic>>);
 
       expect(createdRecord['changes'][0]['new_val']['name'], equals('a'));
       expect(createdRecord['changes'][0]['old_val'], equals(null));
@@ -154,9 +156,9 @@ main() {
 
   group("update command -> ", () {
     test("should update all records in a table", () async {
-      Map update = await r
+      Map update = await (r
           .table(tableName)
-          .update({'lastModified': DateTime.now()}).run(connection);
+          .update({'lastModified': DateTime.now()}).run(connection) as FutureOr<Map<dynamic, dynamic>>);
 
       expect(update['replaced'], equals(5));
     });
@@ -171,45 +173,45 @@ main() {
     });
 
     test("should update a single record", () async {
-      Map updatedSelection = await r
+      Map updatedSelection = await (r
           .table(tableName)
           .get(1)
-          .update({'newField2': 44}).run(connection);
+          .update({'newField2': 44}).run(connection) as FutureOr<Map<dynamic, dynamic>>);
 
       expect(updatedSelection['replaced'], equals(1));
     });
 
     test("should update with durability option", () async {
-      Map updatedSelection = await r
+      Map updatedSelection = await (r
           .table(tableName)
           .get(1)
-          .update({'newField2': 22}, {'durability': 'soft'}).run(connection);
+          .update({'newField2': 22}, {'durability': 'soft'}).run(connection) as FutureOr<Map<dynamic, dynamic>>);
 
       expect(updatedSelection['replaced'], equals(1));
     });
 
     test("should update with return_changes option", () async {
-      Map updatedSelection = await r.table(tableName).get(1).update(
-          {'newField2': 11}, {'return_changes': 'always'}).run(connection);
+      Map updatedSelection = await (r.table(tableName).get(1).update(
+          {'newField2': 11}, {'return_changes': 'always'}).run(connection) as FutureOr<Map<dynamic, dynamic>>);
 
       expect(updatedSelection.containsKey('changes'), equals(true));
     });
 
     test("should update with non_atomic option", () async {
-      Map updatedSelection = await r
+      Map updatedSelection = await (r
           .table(tableName)
           .get(1)
-          .update({'newField2': 00}, {'non_atomic': true}).run(connection);
+          .update({'newField2': 00}, {'non_atomic': true}).run(connection) as FutureOr<Map<dynamic, dynamic>>);
 
       expect(updatedSelection['replaced'], equals(1));
     });
 
     test("should update with r.literal", () async {
-      Map updated = await r.table(tableName).get(2).update({
+      Map updated = await (r.table(tableName).get(2).update({
         'kit': r.literal({'bells': 'cow'})
       }, {
         'return_changes': true
-      }).run(connection);
+      }).run(connection) as FutureOr<Map<dynamic, dynamic>>);
 
       Map old_val = updated['changes'][0]['old_val'];
       Map new_val = updated['changes'][0]['new_val'];
@@ -223,7 +225,7 @@ main() {
   group("replace command -> ", () {
     test("should replace a single selection", () async {
       Map replaced =
-          await r.table(tableName).get(1).replace({'id': 1}).run(connection);
+          await (r.table(tableName).get(1).replace({'id': 1}).run(connection) as FutureOr<Map<dynamic, dynamic>>);
       expect(replaced['replaced'], equals(1));
     });
 
@@ -243,7 +245,7 @@ main() {
 
     test("should populate errors", () async {
       Map replaceError =
-          await r.table(tableName).get(1).replace({}).run(connection);
+          await (r.table(tableName).get(1).replace({}).run(connection) as FutureOr<Map<dynamic, dynamic>>);
 
       expect(replaceError['errors'], equals(1));
       expect(replaceError['first_error'],
@@ -253,12 +255,12 @@ main() {
 
   group("delete command -> ", () {
     test("should delete a single selection", () async {
-      Map deleted = await r
+      Map deleted = await (r
           .table(tableName)
           .get(1)
-          .delete({'return_changes': true}).run(connection);
+          .delete({'return_changes': true}).run(connection) as FutureOr<Map<dynamic, dynamic>>);
 
-      Map newVal = deleted['changes'][0]['new_val'];
+      Map? newVal = deleted['changes'][0]['new_val'];
       Map oldVal = deleted['changes'][0]['old_val'];
 
       expect(deleted['deleted'], equals(1));
@@ -267,14 +269,14 @@ main() {
     });
 
     test("should delete a selection", () async {
-      Map deleted = await r
+      Map deleted = await (r
           .table(tableName)
           .limit(2)
-          .delete({'return_changes': true}).run(connection);
+          .delete({'return_changes': true}).run(connection) as FutureOr<Map<dynamic, dynamic>>);
 
       expect(deleted['changes'].length, equals(2));
 
-      Map newVal = deleted['changes'][0]['new_val'];
+      Map? newVal = deleted['changes'][0]['new_val'];
       Map oldVal = deleted['changes'][0]['old_val'];
 
       expect(deleted['deleted'], equals(2));
@@ -293,7 +295,7 @@ main() {
 
     test("should delete all records on a table", () async {
       await r.table(tableName).delete().run(connection);
-      Cursor results = await r.table(tableName).run(connection);
+      Cursor results = await (r.table(tableName).run(connection) as FutureOr<Cursor>);
 
       List resList = await results.toList();
       expect(resList.isEmpty, equals(true));
@@ -302,7 +304,7 @@ main() {
 
   group("sync command -> ", () {
     test("should sync", () async {
-      Map syncComplete = await r.table(tableName).sync().run(connection);
+      Map syncComplete = await (r.table(tableName).sync().run(connection) as FutureOr<Map<dynamic, dynamic>>);
 
       expect(syncComplete.containsKey('synced'), equals(true));
       expect(syncComplete['synced'], equals(1));
@@ -310,7 +312,7 @@ main() {
   });
 
   test("remove the test database", () async {
-    Map response = await r.dbDrop(testDbName).run(connection);
+    Map response = await (r.dbDrop(testDbName).run(connection) as FutureOr<Map<dynamic, dynamic>>);
 
     expect(response.containsKey('config_changes'), equals(true));
     expect(response['dbs_dropped'], equals(1));